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

Side by Side Diff: chrome/browser/managed_mode/managed_mode.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix double registration in Chrome Frame test. Created 7 years, 10 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
« no previous file with comments | « chrome/browser/managed_mode/managed_mode.h ('k') | chrome/browser/metrics/metrics_log.h » ('j') | 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/managed_mode/managed_mode.h" 5 #include "chrome/browser/managed_mode/managed_mode.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/public/pref_change_registrar.h" 8 #include "base/prefs/public/pref_change_registrar.h"
9 #include "base/sequenced_task_runner.h" 9 #include "base/sequenced_task_runner.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/managed_mode/managed_mode_site_list.h" 11 #include "chrome/browser/managed_mode/managed_mode_site_list.h"
12 #include "chrome/browser/policy/url_blacklist_manager.h" 12 #include "chrome/browser/policy/url_blacklist_manager.h"
13 #include "chrome/browser/prefs/pref_registry_simple.h"
13 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.h"
14 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_iterator.h" 17 #include "chrome/browser/ui/browser_iterator.h"
17 #include "chrome/browser/ui/browser_list.h" 18 #include "chrome/browser/ui/browser_list.h"
18 #include "chrome/browser/ui/browser_window.h" 19 #include "chrome/browser/ui/browser_window.h"
19 #include "chrome/common/chrome_notification_types.h" 20 #include "chrome/common/chrome_notification_types.h"
20 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
22 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
23 #include "content/public/browser/notification_service.h" 24 #include "content/public/browser/notification_service.h"
24 #include "content/public/browser/user_metrics.h" 25 #include "content/public/browser/user_metrics.h"
25 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
26 27
27 using content::BrowserThread; 28 using content::BrowserThread;
28 using content::UserMetricsAction; 29 using content::UserMetricsAction;
29 30
30 // static 31 // static
31 ManagedMode* ManagedMode::GetInstance() { 32 ManagedMode* ManagedMode::GetInstance() {
32 return Singleton<ManagedMode, LeakySingletonTraits<ManagedMode> >::get(); 33 return Singleton<ManagedMode, LeakySingletonTraits<ManagedMode> >::get();
33 } 34 }
34 35
35 // static 36 // static
36 void ManagedMode::RegisterPrefs(PrefServiceSimple* prefs) { 37 void ManagedMode::RegisterPrefs(PrefRegistrySimple* registry) {
37 prefs->RegisterBooleanPref(prefs::kInManagedMode, false); 38 registry->RegisterBooleanPref(prefs::kInManagedMode, false);
38 } 39 }
39 40
40 // static 41 // static
41 void ManagedMode::Init(Profile* profile) { 42 void ManagedMode::Init(Profile* profile) {
42 GetInstance()->InitImpl(profile); 43 GetInstance()->InitImpl(profile);
43 } 44 }
44 45
45 void ManagedMode::InitImpl(Profile* profile) { 46 void ManagedMode::InitImpl(Profile* profile) {
46 DCHECK(g_browser_process); 47 DCHECK(g_browser_process);
47 DCHECK(g_browser_process->local_state()); 48 DCHECK(g_browser_process->local_state());
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 managed_profile_ = newly_managed_profile; 231 managed_profile_ = newly_managed_profile;
231 g_browser_process->local_state()->SetBoolean(prefs::kInManagedMode, 232 g_browser_process->local_state()->SetBoolean(prefs::kInManagedMode,
232 !!newly_managed_profile); 233 !!newly_managed_profile);
233 234
234 // This causes the avatar and the profile menu to get updated. 235 // This causes the avatar and the profile menu to get updated.
235 content::NotificationService::current()->Notify( 236 content::NotificationService::current()->Notify(
236 chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, 237 chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
237 content::NotificationService::AllBrowserContextsAndSources(), 238 content::NotificationService::AllBrowserContextsAndSources(),
238 content::NotificationService::NoDetails()); 239 content::NotificationService::NoDetails());
239 } 240 }
OLDNEW
« no previous file with comments | « chrome/browser/managed_mode/managed_mode.h ('k') | chrome/browser/metrics/metrics_log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698