Remove SB14 code (#3902)

b/355449840
youtube · Aug 7, 2024 · 27db244 · 27db244
1 parent d4ec2d6
commit 27db244
Show file tree

Hide file tree

Showing 88 changed files with 16 additions and 921 deletions.
diff --git a/cobalt/browser/user_agent_platform_info.cc b/cobalt/browser/user_agent_platform_info.cc
@@ -395,11 +395,7 @@ void InitializeUserAgentPlatformInfoFields(UserAgentPlatformInfo& info) {
           info.set_original_design_manufacturer(input.second);
           LOG(INFO) << "Set original design manufacturer to " << input.second;
         } else if (!input.first.compare("device_type")) {
-#if SB_API_VERSION < 15
-          info.set_device_type(GetDeviceType(input.second));
-#else
           info.set_device_type(input.second);
-#endif
           LOG(INFO) << "Set device type to " << input.second;
         } else if (!input.first.compare("chipset_model_number")) {
           info.set_chipset_model_number(input.second);

diff --git a/cobalt/dom/html_media_element.cc b/cobalt/dom/html_media_element.cc
@@ -706,16 +706,12 @@ void HTMLMediaElement::ScheduleEvent(const scoped_refptr<web::Event>& event) {
 }
 
 std::string HTMLMediaElement::h5vcc_audio_connectors() const {
-#if SB_API_VERSION >= 15
   if (!player_) {
     return "";
   }
 
   std::vector<std::string> configs = player_->GetAudioConnectors();
   return base::JoinString(configs, ";");
-#else   // SB_API_VERSION >= 15
-  return "";
-#endif  // SB_API_VERSION >= 15
 }
 
 void HTMLMediaElement::CreateMediaPlayer() {

diff --git a/cobalt/dom/keyboard_event.cc b/cobalt/dom/keyboard_event.cc
@@ -337,10 +337,8 @@ std::string KeyboardEvent::NonPrintableKey(int32_t key_code) const {
       return "MediaStop";
     case keycode::kMediaPlayPause:
       return "MediaPlayPause";
-#if SB_API_VERSION >= 15
     case keycode::kMediaRecord:
       return "MediaRecord";
-#endif
     case keycode::kMediaLaunchMail:
       return "LaunchMail";
     case keycode::kMediaLaunchMediaSelect:

diff --git a/cobalt/dom/keyboard_event_test.cc b/cobalt/dom/keyboard_event_test.cc
@@ -135,14 +135,12 @@ TEST_F(KeyboardEventTest, CanGetKeyIdentifierAndKeyAndCode) {
   EXPECT_EQ(keyboard_event_space->key(), " ");
   EXPECT_EQ(keyboard_event_space->code(), "Space");
 
-#if SB_API_VERSION >= 15
   init.set_key_code(keycode::kMediaRecord);
   scoped_refptr<KeyboardEvent> keyboard_event_record =
       new KeyboardEvent("keydown", init);
   EXPECT_EQ(keyboard_event_record->key_identifier(), "MediaRecord");
   EXPECT_EQ(keyboard_event_record->key(), "MediaRecord");
   EXPECT_EQ(keyboard_event_record->code(), "MediaRecord");
-#endif
 }
 
 TEST_F(KeyboardEventTest, CanGetAltKey) {

diff --git a/cobalt/dom/keycode.h b/cobalt/dom/keycode.h
@@ -200,9 +200,7 @@ enum {
   // Not present in Windows virtual key codes, but would be used by the client.
   kMediaRewind = 0xE3,
   kMediaFastForward = 0xE4,
-#if SB_API_VERSION >= 15
   kMediaRecord = 0x1A0,
-#endif
 };
 
 }  // namespace keycode

diff --git a/cobalt/extension/configuration.h b/cobalt/extension/configuration.h
diff --git a/cobalt/extension/crash_handler.h b/cobalt/extension/crash_handler.h
diff --git a/cobalt/extension/demuxer.h b/cobalt/extension/demuxer.h
diff --git a/cobalt/extension/font.h b/cobalt/extension/font.h
diff --git a/cobalt/extension/free_space.h b/cobalt/extension/free_space.h
diff --git a/cobalt/extension/graphics.h b/cobalt/extension/graphics.h
diff --git a/cobalt/extension/installation_manager.h b/cobalt/extension/installation_manager.h
diff --git a/cobalt/extension/javascript_cache.h b/cobalt/extension/javascript_cache.h
diff --git a/cobalt/extension/media_session.h b/cobalt/extension/media_session.h
diff --git a/cobalt/extension/memory_mapped_file.h b/cobalt/extension/memory_mapped_file.h
diff --git a/cobalt/extension/platform_service.h b/cobalt/extension/platform_service.h
diff --git a/cobalt/extension/updater_notification.h b/cobalt/extension/updater_notification.h
diff --git a/cobalt/extension/url_fetcher_observer.h b/cobalt/extension/url_fetcher_observer.h