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

Side by Side Diff: chrome/browser/prefs/incognito_mode_prefs.cc

Issue 1556383002: Partially revert of Upstrem prefs changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/incognito_mode_prefs.h" 5 #include "chrome/browser/prefs/incognito_mode_prefs.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 FROM_HERE, 206 FROM_HERE,
207 base::Bind( 207 base::Bind(
208 base::IgnoreResult(&PlatformParentalControlsValue::GetInstance))); 208 base::IgnoreResult(&PlatformParentalControlsValue::GetInstance)));
209 } 209 }
210 #endif 210 #endif
211 211
212 // static 212 // static
213 bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() { 213 bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() {
214 #if defined(OS_WIN) 214 #if defined(OS_WIN)
215 return PlatformParentalControlsValue::GetInstance()->is_enabled(); 215 return PlatformParentalControlsValue::GetInstance()->is_enabled();
216 #elif defined(OS_ANDROID) && defined(USE_AURA)
217 // TODO(bshe): Support parental controls for Aura Android. See
218 // crbug.com/564742
219 NOTIMPLEMENTED();
220 return false;
221 #elif BUILDFLAG(ANDROID_JAVA_UI) 216 #elif BUILDFLAG(ANDROID_JAVA_UI)
222 return chrome::android::ChromeApplication::AreParentalControlsEnabled(); 217 return chrome::android::ChromeApplication::AreParentalControlsEnabled();
223 #else 218 #else
224 return false; 219 return false;
225 #endif 220 #endif
226 } 221 }
227 222
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698