chrome/browser/prefs/incognito_mode_prefs.cc - Issue 1391893003: NOT FOR REVIEW: Aura on Android

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/prefs/incognito_mode_prefs.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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/prefs/incognito_mode_prefs.cc

diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc

index f9d0fcd880efc0d3e795402a3783858cc1aeb8f2..2ac976838ef1398e5bcdf14fcec5c5e28e6bb259 100644

--- a/chrome/browser/prefs/incognito_mode_prefs.cc

+++ b/chrome/browser/prefs/incognito_mode_prefs.cc

@@ -208,7 +208,8 @@ void IncognitoModePrefs::InitializePlatformParentalControls() {

bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() {

#if defined(OS_WIN)

return PlatformParentalControlsValue::GetInstance()->is_enabled();

-#elif defined(OS_ANDROID)

+// TODO(mfomitchev): ifdefing for now

+#elif defined(OS_ANDROID) && !defined(USE_AURA)

return chrome::android::ChromeApplication::AreParentalControlsEnabled();

#else

return false;