NOT FOR REVIEW: Aura on Android

chrome/browser/prefs/browser_prefs.cc

Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index f092abcb7fd519db67a2b0b760026eb8362df931..4f5753b877a496e698181270a156379f106d0433 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -120,7 +120,7 @@
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
 #include "extensions/browser/extension_prefs.h"
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#if (!defined(OS_ANDROID) || defined(USE_AURA)) && !defined(OS_IOS)
 #include "chrome/browser/extensions/api/copresence/copresence_api.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #endif
@@ -142,7 +142,7 @@
 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
 #endif
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 #include "chrome/browser/android/new_tab_page_prefs.h"
 #else
@@ -151,9 +151,10 @@
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #endif
 
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
-#include "chrome/browser/signin/signin_promo.h"
+#if (!defined(OS_ANDROID)/* || defined(USE_AURA)*/) && !defined(OS_IOS)
 #include "chrome/browser/ui/webui/foreign_session_handler.h"
+#elif defined(OS_ANDROID) && defined(USE_AURA)
+#include "chrome/browser/signin/signin_promo.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -225,7 +226,7 @@
 
 namespace {
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID)// || defined(USE_AURA)
 // The AutomaticProfileResetter service used this preference to save that the
 // profile reset prompt had already been shown, however, the preference has been
 // renamed in Local State. We keep the name here for now so that we can clear
@@ -281,7 +282,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   EasyUnlockService::RegisterPrefs(registry);
 #endif
 
-#if defined(ENABLE_NOTIFICATIONS) && !defined(OS_ANDROID)
+#if defined(ENABLE_NOTIFICATIONS) && (!defined(OS_ANDROID)/* || defined(USE_AURA)*/)
   // Android does not use the message center for notifications.
   MessageCenterNotificationManager::RegisterPrefs(registry);
 #endif
@@ -298,17 +299,19 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   TaskManager::RegisterPrefs(registry);
 #endif  // defined(ENABLE_TASK_MANAGER)
 
-#if !defined(OS_ANDROID)
-  AutomaticProfileResetterFactory::RegisterPrefs(registry);
+#if !defined(OS_ANDROID) || defined(USE_AURA)
   BackgroundModeManager::RegisterPrefs(registry);
   RegisterBrowserPrefs(registry);
-  StartupBrowserCreator::RegisterLocalStatePrefs(registry);
+#if !defined(OS_ANDROID)
+  AutomaticProfileResetterFactory::RegisterPrefs(registry);
   // The native GCM is used on Android instead.
   gcm::GCMChannelStatusSyncer::RegisterPrefs(registry);
+  StartupBrowserCreator::RegisterLocalStatePrefs(registry);
+#endif
 #if !defined(OS_CHROMEOS)
   RegisterDefaultBrowserPromptPrefs(registry);
 #endif  // !defined(OS_CHROMEOS)
-#endif  // !defined(OS_ANDROID)
+#endif  // !defined(OS_ANDROID) || defined(USE_AURA)
 
 #if defined(OS_CHROMEOS)
   ChromeOSMetricsProvider::RegisterPrefs(registry);
@@ -363,9 +366,9 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
 
   // Preferences registered only for migration (clearing or moving to a new key)
   // go here.
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID)// || defined(USE_AURA)
   registry->RegisterDictionaryPref(kLegacyProfileResetPromptMemento);
-#endif  // !defined(OS_ANDROID)
+#endif  // !defined(OS_ANDROID) || defined(USE_AURA)
 }
 
 // Register prefs applicable to all profiles.
@@ -425,7 +428,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   extensions::launch_util::RegisterProfilePrefs(registry);
   ExtensionWebUI::RegisterProfilePrefs(registry);
   extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#if (!defined(OS_ANDROID) || defined(USE_AURA)) && !defined(OS_IOS)
   ToolbarActionsBar::RegisterProfilePrefs(registry);
   extensions::CopresenceService::RegisterProfilePrefs(registry);
 #endif
@@ -437,7 +440,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
 #endif
 
 #if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS) && \
-    !defined(OS_ANDROID)
+    (!defined(OS_ANDROID)/* || defined(USE_AURA)*/)
   // The extension welcome notification requires a build that enables extensions
   // and notifications, and uses the UI message center.
   ExtensionWelcomeNotification::RegisterProfilePrefs(registry);
@@ -452,7 +455,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
 #endif
 
 #if defined(ENABLE_SUPERVISED_USERS)
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#if (!defined(OS_ANDROID)/* || defined(USE_AURA)*/) && !defined(OS_IOS)
   SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry);
   SupervisedUserSyncService::RegisterProfilePrefs(registry);
 #endif
@@ -463,28 +466,34 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
 
 #if defined(OS_ANDROID)
   chrome_variations::VariationsService::RegisterProfilePrefs(registry);
+#if !defined(USE_AURA)
   NewTabPagePrefs::RegisterProfilePrefs(registry);
   PartnerBookmarksShim::RegisterProfilePrefs(registry);
-#else
+#endif
+#endif
+
+#if !defined(OS_ANDROID) || defined(USE_AURA)
   AppShortcutManager::RegisterProfilePrefs(registry);
+  DevToolsWindow::RegisterProfilePrefs(registry);
+  first_run::RegisterProfilePrefs(registry);
+  NewTabUI::RegisterProfilePrefs(registry);
+  PluginsUI::RegisterProfilePrefs(registry);
+  PinnedTabCodec::RegisterProfilePrefs(registry);
+  signin::RegisterProfilePrefs(registry);
+#if !defined(OS_ANDROID)
   autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry);
   DeviceIDFetcher::RegisterProfilePrefs(registry);
-  DevToolsWindow::RegisterProfilePrefs(registry);
   DriveAppMapping::RegisterProfilePrefs(registry);
   extensions::CommandService::RegisterProfilePrefs(registry);
   extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
   extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
-  first_run::RegisterProfilePrefs(registry);
   gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
-  NewTabUI::RegisterProfilePrefs(registry);
   PepperFlashSettingsManager::RegisterProfilePrefs(registry);
-  PinnedTabCodec::RegisterProfilePrefs(registry);
-  PluginsUI::RegisterProfilePrefs(registry);
   RegisterAutolaunchUserPrefs(registry);
-  signin::RegisterProfilePrefs(registry);
+#endif
 #endif
 
-#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+#if (!defined(OS_ANDROID) || defined(USE_AURA)) && !defined(OS_CHROMEOS)
   default_apps::RegisterProfilePrefs(registry);
 #endif
 
@@ -517,7 +526,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   ash::RegisterChromeLauncherUserPrefs(registry);
 #endif
 
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#if (!defined(OS_ANDROID)/* || defined(USE_AURA)*/) && !defined(OS_IOS)
   browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);
 #endif
 }
@@ -549,7 +558,7 @@ void MigrateObsoleteBrowserPrefs(Profile* profile, PrefService* local_state) {
   MigrateBrowserTabStripPrefs(local_state);
 #endif
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID)// || defined(USE_AURA)
   // Added 08/2014.
   local_state->ClearPref(kLegacyProfileResetPromptMemento);
 #endif