chrome/browser/chromeos/preferences.cc - Issue 542623002: Minimal support for OOBE/login for chrome-athena

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: overscroll 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:

Index: chrome/browser/chromeos/preferences.cc

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc

index 85118ba236482f7eaac40493cfaf2f209e9a671c..f34004bb5afc313b85a9fe9e69b37e76f98aaf56 100644

--- a/chrome/browser/chromeos/preferences.cc

+++ b/chrome/browser/chromeos/preferences.cc

@@ -529,10 +529,10 @@ void Preferences::ApplyPreferences(ApplyReason reason,

}

if (reason != REASON_PREF_CHANGED ||

pref_name == prefs::kTouchHudProjectionEnabled) {

- if (user_is_active) {

Nikita (slow) 2014/09/08 09:53:17 I think user_is_active check was incorrectly remov

Dmitry Polukhin 2014/09/08 13:28:19 Done. Good catch!

- const bool enabled = touch_hud_projection_enabled_.GetValue();

- ash::Shell::GetInstance()->SetTouchHudProjectionEnabled(enabled);

- }

+#if !defined(USE_ATHENA)

+ const bool enabled = touch_hud_projection_enabled_.GetValue();

+ ash::Shell::GetInstance()->SetTouchHudProjectionEnabled(enabled);

+#endif

}

if (reason != REASON_PREF_CHANGED ||