summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/webui/options/browser_options_handler.cc4
-rw-r--r--chrome/browser/ui/webui/sync_setup_handler.cc2
2 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 03ac050..2fe5ad8 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -1516,8 +1516,6 @@ void BrowserOptionsHandler::VirtualKeyboardChangeCallback(
chromeos::accessibility::EnableVirtualKeyboard(enabled);
}
-#if defined(OS_CHROMEOS)
-
void BrowserOptionsHandler::PerformFactoryResetRestart(
const base::ListValue* args) {
if (g_browser_process->browser_policy_connector()->IsEnterpriseManaged())
@@ -1532,8 +1530,6 @@ void BrowserOptionsHandler::PerformFactoryResetRestart(
chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
}
-#endif
-
void BrowserOptionsHandler::SetupAccessibilityFeatures() {
PrefService* pref_service = g_browser_process->local_state();
base::FundamentalValue virtual_keyboard_enabled(
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index 6977a8f..07a2f30 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -769,9 +769,7 @@ void SyncSetupHandler::HandleStartSignin(const base::ListValue* args) {
void SyncSetupHandler::HandleStopSyncing(const base::ListValue* args) {
if (GetSyncService())
ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
-#if !defined(OS_CHROMEOS)
SigninManagerFactory::GetForProfile(GetProfile())->SignOut();
-#endif
}
#endif