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

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

Issue 271793003: components: Extract pref_registry component out of user_prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 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 | Annotate | Revision Log
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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
12 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
13 #include "components/user_prefs/pref_registry_syncable.h" 13 #include "components/pref_registry/pref_registry_syncable.h"
14 14
15 #if defined(OS_WIN) 15 #if defined(OS_WIN)
16 #include "base/win/metro.h" 16 #include "base/win/metro.h"
17 #endif // OS_WIN 17 #endif // OS_WIN
18 18
19 #if defined(OS_ANDROID) 19 #if defined(OS_ANDROID)
20 #include "chrome/browser/android/chromium_application.h" 20 #include "chrome/browser/android/chromium_application.h"
21 #endif // OS_ANDROID 21 #endif // OS_ANDROID
22 22
23 // static 23 // static
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 #if defined(OS_WIN) 95 #if defined(OS_WIN)
96 // Disable incognito mode windows if parental controls are on. This is only 96 // Disable incognito mode windows if parental controls are on. This is only
97 // for Windows Vista and above. 97 // for Windows Vista and above.
98 return base::win::IsParentalControlActivityLoggingOn(); 98 return base::win::IsParentalControlActivityLoggingOn();
99 #elif defined(OS_ANDROID) 99 #elif defined(OS_ANDROID)
100 return chrome::android::ChromiumApplication::AreParentalControlsEnabled(); 100 return chrome::android::ChromiumApplication::AreParentalControlsEnabled();
101 #else 101 #else
102 return false; 102 return false;
103 #endif 103 #endif
104 } 104 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/chrome_pref_service_unittest.cc ('k') | chrome/browser/prefs/pref_hash_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698