NOT FOR REVIEW: Aura on Android

chrome/browser/ui/webui/options/options_ui.cc

Index: chrome/browser/ui/webui/options/options_ui.cc
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index e69c1990c2f61d4bdfd25a10422acb309ca23b55..1763539f0754a2a9fc0f7961b19c19e0fc160a3d 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -270,19 +270,31 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)
   AddOptionsPageUIHandler(localized_strings,
                           new AutomaticSettingsResetHandler());
 
+#if !defined(OS_ANDROID)
   BrowserOptionsHandler* browser_options_handler = new BrowserOptionsHandler();
   AddOptionsPageUIHandler(localized_strings, browser_options_handler);
+#endif
 
   AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler());
   AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
   AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler());
+#if !defined(OS_ANDROID)
   AddOptionsPageUIHandler(localized_strings, new CreateProfileHandler());
+#endif
+
   AddOptionsPageUIHandler(localized_strings, new EasyUnlockHandler());
+
+#if !defined(OS_ANDROID)
   AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());
+#endif
+
 #if defined(ENABLE_GOOGLE_NOW)
   AddOptionsPageUIHandler(localized_strings, new GeolocationOptionsHandler());
 #endif
+#if !defined(OS_ANDROID)
   AddOptionsPageUIHandler(localized_strings, new options::HelpOverlayHandler());
+#endif
+
   AddOptionsPageUIHandler(localized_strings, new HomePageOverlayHandler());
   AddOptionsPageUIHandler(localized_strings,
                           new MediaDevicesSelectionHandler());
@@ -298,9 +310,13 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)
   AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
   AddOptionsPageUIHandler(localized_strings, new ResetProfileSettingsHandler());
   AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
+
+#if !defined(OS_ANDROID)
   AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
+#endif
+
   AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler());
-#if defined(ENABLE_SUPERVISED_USERS)
+#if defined(ENABLE_SUPERVISED_USERS) && !defined(OS_ANDROID)
   AddOptionsPageUIHandler(localized_strings,
                           new SupervisedUserCreateConfirmHandler());
   AddOptionsPageUIHandler(localized_strings, new SupervisedUserImportHandler());
@@ -376,7 +392,10 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)
 
   pointer_device_observer_.reset(
       new chromeos::system::PointerDeviceObserver());
+
+#if !defined(OS_ANDROID)
   pointer_device_observer_->AddObserver(browser_options_handler);
+#endif
   pointer_device_observer_->AddObserver(pointer_handler);
 #endif
 }