Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(928)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/preferences.cc

Issue 542623002: Minimal support for OOBE/login for chrome-athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments resolved Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/login/ui/login_display_host_impl.cc ('K') | « chrome/browser/chromeos/login/ui/webui_login_view.cc ('k') | chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc » ('j') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/preferences.cc
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 85118ba236482f7eaac40493cfaf2f209e9a671c..3382babc15bfc20db2a501d03f3c07b0ccd9e0ea 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -529,10 +529,12 @@ void Preferences::ApplyPreferences(ApplyReason reason,
}
if (reason != REASON_PREF_CHANGED ||
pref_name == prefs::kTouchHudProjectionEnabled) {
+#if !defined(USE_ATHENA)
if (user_is_active) {
const bool enabled = touch_hud_projection_enabled_.GetValue();
ash::Shell::GetInstance()->SetTouchHudProjectionEnabled(enabled);
}
+#endif
}
if (reason != REASON_PREF_CHANGED ||
« chrome/browser/chromeos/login/ui/login_display_host_impl.cc ('K') | « chrome/browser/chromeos/login/ui/webui_login_view.cc ('k') | chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc » ('j') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698