summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/prefs/browser_prefs.cc13
-rw-r--r--chrome/browser/profiles/profile_dependency_manager.cc2
-rw-r--r--chrome/browser/profiles/profile_impl.cc11
-rw-r--r--chrome/browser/profiles/profile_manager_unittest.cc3
-rw-r--r--chrome/browser/ui/browser.cc12
-rw-r--r--chrome/chrome_browser.gypi13
-rw-r--r--chrome/chrome_tests.gypi19
7 files changed, 54 insertions, 19 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 2fc05ff..3a885de 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -110,7 +110,6 @@ void RegisterLocalState(PrefService* local_state) {
local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
AppsPromo::RegisterPrefs(local_state);
- Browser::RegisterPrefs(local_state);
browser_shutdown::RegisterPrefs(local_state);
ExternalProtocolHandler::RegisterPrefs(local_state);
geolocation::RegisterPrefs(local_state);
@@ -120,7 +119,6 @@ void RegisterLocalState(PrefService* local_state) {
ManagedMode::RegisterPrefs(local_state);
MetricsLog::RegisterPrefs(local_state);
MetricsService::RegisterPrefs(local_state);
- NotificationUIManager::RegisterPrefs(local_state);
PrefProxyConfigTrackerImpl::RegisterPrefs(local_state);
ProfileInfoCache::RegisterPrefs(local_state);
ProfileManager::RegisterPrefs(local_state);
@@ -132,6 +130,10 @@ void RegisterLocalState(PrefService* local_state) {
policy::CloudPolicySubsystem::RegisterPrefs(local_state);
#endif
+#if defined(ENABLE_NOTIFICATIONS)
+ NotificationUIManager::RegisterPrefs(local_state);
+#endif
+
#if defined(ENABLE_SAFE_BROWSING)
SafeBrowsingService::RegisterPrefs(local_state);
#endif
@@ -142,6 +144,7 @@ void RegisterLocalState(PrefService* local_state) {
#if !defined(OS_ANDROID)
BackgroundModeManager::RegisterPrefs(local_state);
+ Browser::RegisterPrefs(local_state);
FlagsUI::RegisterPrefs(local_state);
NewTabPageHandler::RegisterPrefs(local_state);
printing::PrintJobManager::RegisterPrefs(local_state);
@@ -176,8 +179,6 @@ void RegisterUserPrefs(PrefService* user_prefs) {
AutofillManager::RegisterUserPrefs(user_prefs);
bookmark_utils::RegisterUserPrefs(user_prefs);
BookmarkModel::RegisterUserPrefs(user_prefs);
- Browser::RegisterUserPrefs(user_prefs);
- BrowserInit::RegisterUserPrefs(user_prefs);
ChromeVersionService::RegisterUserPrefs(user_prefs);
chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs);
chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs);
@@ -194,7 +195,6 @@ void RegisterUserPrefs(PrefService* user_prefs) {
NetPrefObserver::RegisterPrefs(user_prefs);
NewTabUI::RegisterUserPrefs(user_prefs);
PasswordManager::RegisterUserPrefs(user_prefs);
- PinnedTabCodec::RegisterUserPrefs(user_prefs);
PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs);
PrefsTabHelper::RegisterUserPrefs(user_prefs);
ProfileImpl::RegisterUserPrefs(user_prefs);
@@ -223,6 +223,9 @@ void RegisterUserPrefs(PrefService* user_prefs) {
#endif
#if !defined(OS_ANDROID)
+ Browser::RegisterUserPrefs(user_prefs);
+ BrowserInit::RegisterUserPrefs(user_prefs);
+ PinnedTabCodec::RegisterUserPrefs(user_prefs);
PluginsUI::RegisterUserPrefs(user_prefs);
PromoResourceService::RegisterUserPrefs(user_prefs);
SyncPromoUI::RegisterUserPrefs(user_prefs);
diff --git a/chrome/browser/profiles/profile_dependency_manager.cc b/chrome/browser/profiles/profile_dependency_manager.cc
index e0a278f..664acf1 100644
--- a/chrome/browser/profiles/profile_dependency_manager.cc
+++ b/chrome/browser/profiles/profile_dependency_manager.cc
@@ -180,7 +180,9 @@ void ProfileDependencyManager::AssertFactoriesBuilt() {
NTPResourceCacheFactory::GetInstance();
PasswordStoreFactory::GetInstance();
PersonalDataManagerFactory::GetInstance();
+#if !defined(OS_ANDROID)
PinnedTabServiceFactory::GetInstance();
+#endif
PluginPrefsFactory::GetInstance();
protector::ProtectorServiceFactory::GetInstance();
prerender::PrerenderManagerFactory::GetInstance();
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 78597e5..0c89433 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -362,13 +362,18 @@ void ProfileImpl::DoFinalInit(bool is_new_profile) {
FilePath app_path = GetPath().Append(chrome::kIsolatedAppStateDirname);
- SessionStartupPref startup_pref =
+#if defined(OS_ANDROID)
+ SessionStartupPref::Type startup_pref_type =
+ SessionStartupPref::GetDefaultStartupType();
+#else
+ SessionStartupPref::Type startup_pref_type =
BrowserInit::GetSessionStartupPref(*CommandLine::ForCurrentProcess(),
- this);
+ this).type;
+#endif
bool restore_old_session_cookies =
session_restore_enabled_ &&
(!DidLastSessionExitCleanly() ||
- startup_pref.type == SessionStartupPref::LAST);
+ startup_pref_type == SessionStartupPref::LAST);
InitHostZoomMap();
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index 7cfbb27..2644176 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -384,6 +384,8 @@ TEST_F(ProfileManagerTest, InitProfileInfoCacheForAProfile) {
cache.GetAvatarIconIndexOfProfileAtIndex(profile_index));
}
+#if !defined(OS_ANDROID)
+// There's no Browser object on Android.
TEST_F(ProfileManagerTest, LastOpenedProfiles) {
FilePath dest_path1 = temp_dir_.path();
dest_path1 = dest_path1.Append(FILE_PATH_LITERAL("New Profile 1"));
@@ -548,3 +550,4 @@ TEST_F(ProfileManagerTest, LastOpenedProfilesDoesNotContainIncognito) {
last_opened_profiles = profile_manager->GetLastOpenedProfiles();
ASSERT_EQ(0U, last_opened_profiles.size());
}
+#endif // !defined(OS_ANDROID)
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index e30a66b..42419c3 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -321,9 +321,7 @@ bool ParseCommaSeparatedIntegers(const std::string& str,
}
bool AllowPanels(const std::string& app_name) {
- // TODO(yfriedman): remove OS_ANDROID clause when browser is excluded from
- // Android build.
-#if (!defined(OS_CHROMEOS) || defined(USE_AURA)) && !defined(OS_ANDROID)
+#if (!defined(OS_CHROMEOS) || defined(USE_AURA))
if (!PanelManager::ShouldUsePanels(
web_app::GetExtensionIdFromApplicationName(app_name))) {
return false;
@@ -4676,9 +4674,6 @@ void Browser::ShowFirstRunBubble() {
// Browser, protected:
BrowserWindow* Browser::CreateBrowserWindow() {
- // TODO(yfriedman): remove OS_ANDROID clause when browser is excluded from
- // Android build.
-#if !defined(OS_ANDROID)
bool create_panel = false;
#if defined(USE_ASH)
if (CommandLine::ForCurrentProcess()->HasSwitch(
@@ -4689,7 +4684,6 @@ BrowserWindow* Browser::CreateBrowserWindow() {
#endif
if (create_panel)
return PanelManager::GetInstance()->CreatePanel(this);
-#endif // OS_ANDROID
return BrowserWindow::CreateBrowserWindow(this);
}
@@ -5694,9 +5688,6 @@ void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) {
}
void Browser::ShowSyncSetup(SyncPromoUI::Source source) {
- // TODO(yfriedman): remove OS_ANDROID clause when browser is excluded from
- // Android build.
-#if !defined(OS_ANDROID)
ProfileSyncService* service =
ProfileSyncServiceFactory::GetInstance()->GetForProfile(
profile()->GetOriginalProfile());
@@ -5715,7 +5706,6 @@ void Browser::ShowSyncSetup(SyncPromoUI::Source source) {
LoginUIServiceFactory::GetForProfile(
profile()->GetOriginalProfile())->ShowLoginUI(false);
}
-#endif
}
void Browser::ToggleSpeechInput() {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 1c5a9ec..9789fa1 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4482,6 +4482,17 @@
'browser/about_flags.h',
'browser/jankometer.cc',
+
+ # There's no Browser/BrowserList on Android.
+ 'browser/net/gaia/gaia_oauth_fetcher.cc',
+ 'browser/ui/browser.cc',
+ 'browser/ui/browser_init.cc',
+ 'browser/ui/browser_list.cc',
+ 'browser/ui/browser_list_stub.cc',
+ 'browser/ui/browser_navigator.cc',
+ 'browser/ui/browser_tab_restore_service_delegate.cc',
+ 'browser/ui/sync/browser_synced_window_delegate.cc',
+
'browser/ui/sad_tab_helper.cc',
'browser/ui/webui/certificate_viewer_webui.cc',
'browser/ui/window_sizer.cc',
@@ -4496,6 +4507,8 @@
['exclude', '^browser/chrome_to_mobile'],
['exclude', '^browser/importer/'],
['exclude', '^browser/printing/'],
+ ['exclude', '^browser/tabs/pinned_tab_'],
+ ['exclude', '^browser/tabs/tab_strip_model'],
['exclude', '^browser/ui/panels/'],
['exclude', '^browser/ui/tabs/'],
['exclude', '^browser/ui/toolbar/'],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 50cda9a..9d68337 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2452,11 +2452,30 @@
# about:flags is unsupported.
'browser/about_flags_unittest.cc',
+ # There's no Browser/BrowserList on Android.
+ 'browser/browser_commands_unittest.cc',
+ 'browser/net/gaia/gaia_oauth_fetcher_unittest.cc',
+ 'browser/profiles/off_the_record_profile_impl_unittest.cc',
+ 'browser/sessions/session_service_unittest.cc',
+ 'browser/sync/profile_sync_service_session_unittest.cc',
+ 'browser/sync/sync_global_error_unittest.cc',
+ 'browser/sync/sync_setup_wizard_unittest.cc',
+ 'browser/ui/browser_list_unittest.cc',
+ 'browser/ui/browser_unittest.cc',
+ 'browser/ui/toolbar/toolbar_model_unittest.cc',
+ 'browser/ui/toolbar/wrench_menu_model_unittest.cc',
+ 'browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc',
+ 'test/base/browser_with_test_window_test.cc',
+ 'test/base/browser_with_test_window_test.h',
+ 'test/base/test_browser_window.h',
+
'browser/ui/window_sizer_unittest.cc',
],
'sources/': [
['exclude', '^browser/chrome_to_mobile'],
['exclude', '^browser/printing/'],
+ ['exclude', '^browser/tabs/pinned_tab_'],
+ ['exclude', '^browser/tabs/tab_strip_model'],
['exclude', '^browser/themes/'],
['exclude', '^browser/ui/panels'],
['exclude', '^browser/ui/tabs/'],
generated by cgit v1.1 at 2025-02-01 14:43:47 +0000