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

Side by Side Diff: chrome/browser/browser_process_impl.h

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | 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 // When each service is created, we set a flag indicating this. At this point, 5 // When each service is created, we set a flag indicating this. At this point,
6 // the service initialization could fail or succeed. This allows us to remember 6 // the service initialization could fail or succeed. This allows us to remember
7 // if we tried to create a service, and not try creating it over and over if 7 // if we tried to create a service, and not try creating it over and over if
8 // the creation failed. 8 // the creation failed.
9 9
10 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 10 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
11 #define CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 11 #define CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
12 12
13 #include <string> 13 #include <string>
14 14
15 #include "base/basictypes.h" 15 #include "base/basictypes.h"
16 #include "base/debug/stack_trace.h" 16 #include "base/debug/stack_trace.h"
17 #include "base/memory/ref_counted.h" 17 #include "base/memory/ref_counted.h"
18 #include "base/memory/scoped_ptr.h" 18 #include "base/memory/scoped_ptr.h"
19 #include "base/prefs/public/pref_change_registrar.h" 19 #include "base/prefs/public/pref_change_registrar.h"
20 #include "base/threading/non_thread_safe.h" 20 #include "base/threading/non_thread_safe.h"
21 #include "base/timer.h" 21 #include "base/timer.h"
22 #include "chrome/browser/browser_process.h" 22 #include "chrome/browser/browser_process.h"
23 23
24 class ChromeNetLog; 24 class ChromeNetLog;
25 class ChromeResourceDispatcherHostDelegate; 25 class ChromeResourceDispatcherHostDelegate;
26 class CommandLine; 26 class CommandLine;
27 class RemoteDebuggingServer; 27 class RemoteDebuggingServer;
28 class PrefServiceSimple; 28 class PrefRegistrarSimple;
29 29
30 #if defined(ENABLE_PLUGIN_INSTALLATION) 30 #if defined(ENABLE_PLUGIN_INSTALLATION)
31 class PluginsResourceService; 31 class PluginsResourceService;
32 #endif 32 #endif
33 33
34 namespace base { 34 namespace base {
35 class SequencedTaskRunner; 35 class SequencedTaskRunner;
36 } 36 }
37 37
38 namespace policy { 38 namespace policy {
(...skipping 29 matching lines...) Expand all
68 void StartTearDown(); 68 void StartTearDown();
69 void PostDestroyThreads(); 69 void PostDestroyThreads();
70 70
71 // BrowserProcess implementation. 71 // BrowserProcess implementation.
72 virtual void ResourceDispatcherHostCreated() OVERRIDE; 72 virtual void ResourceDispatcherHostCreated() OVERRIDE;
73 virtual void EndSession() OVERRIDE; 73 virtual void EndSession() OVERRIDE;
74 virtual MetricsService* metrics_service() OVERRIDE; 74 virtual MetricsService* metrics_service() OVERRIDE;
75 virtual IOThread* io_thread() OVERRIDE; 75 virtual IOThread* io_thread() OVERRIDE;
76 virtual WatchDogThread* watchdog_thread() OVERRIDE; 76 virtual WatchDogThread* watchdog_thread() OVERRIDE;
77 virtual ProfileManager* profile_manager() OVERRIDE; 77 virtual ProfileManager* profile_manager() OVERRIDE;
78 virtual PrefServiceSimple* local_state() OVERRIDE; 78 virtual PrefService* local_state() OVERRIDE;
79 virtual net::URLRequestContextGetter* system_request_context() OVERRIDE; 79 virtual net::URLRequestContextGetter* system_request_context() OVERRIDE;
80 virtual chrome_variations::VariationsService* variations_service() OVERRIDE; 80 virtual chrome_variations::VariationsService* variations_service() OVERRIDE;
81 #if defined(OS_CHROMEOS) 81 #if defined(OS_CHROMEOS)
82 virtual chromeos::OomPriorityManager* oom_priority_manager() OVERRIDE; 82 virtual chromeos::OomPriorityManager* oom_priority_manager() OVERRIDE;
83 #endif // defined(OS_CHROMEOS) 83 #endif // defined(OS_CHROMEOS)
84 virtual extensions::EventRouterForwarder* 84 virtual extensions::EventRouterForwarder*
85 extension_event_router_forwarder() OVERRIDE; 85 extension_event_router_forwarder() OVERRIDE;
86 virtual NotificationUIManager* notification_ui_manager() OVERRIDE; 86 virtual NotificationUIManager* notification_ui_manager() OVERRIDE;
87 virtual policy::BrowserPolicyConnector* browser_policy_connector() OVERRIDE; 87 virtual policy::BrowserPolicyConnector* browser_policy_connector() OVERRIDE;
88 virtual policy::PolicyService* policy_service() OVERRIDE; 88 virtual policy::PolicyService* policy_service() OVERRIDE;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 virtual ChromeNetLog* net_log() OVERRIDE; 121 virtual ChromeNetLog* net_log() OVERRIDE;
122 virtual prerender::PrerenderTracker* prerender_tracker() OVERRIDE; 122 virtual prerender::PrerenderTracker* prerender_tracker() OVERRIDE;
123 virtual ComponentUpdateService* component_updater() OVERRIDE; 123 virtual ComponentUpdateService* component_updater() OVERRIDE;
124 virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE; 124 virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
125 virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE; 125 virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE;
126 virtual chrome::MediaFileSystemRegistry* 126 virtual chrome::MediaFileSystemRegistry*
127 media_file_system_registry() OVERRIDE; 127 media_file_system_registry() OVERRIDE;
128 virtual void PlatformSpecificCommandLineProcessing( 128 virtual void PlatformSpecificCommandLineProcessing(
129 const CommandLine& command_line) OVERRIDE; 129 const CommandLine& command_line) OVERRIDE;
130 130
131 static void RegisterPrefs(PrefRegistrarSimple* registrar);
132
131 private: 133 private:
132 void CreateMetricsService(); 134 void CreateMetricsService();
133 void CreateWatchdogThread(); 135 void CreateWatchdogThread();
134 #if defined(OS_CHROMEOS) 136 #if defined(OS_CHROMEOS)
135 void InitializeWebSocketProxyThread(); 137 void InitializeWebSocketProxyThread();
136 #endif 138 #endif
137 void CreateProfileManager(); 139 void CreateProfileManager();
138 void CreateLocalState(); 140 void CreateLocalState();
139 void CreateViewedPageTracker(); 141 void CreateViewedPageTracker();
140 void CreateIconManager(); 142 void CreateIconManager();
(...skipping 27 matching lines...) Expand all
168 170
169 // Must be destroyed after |local_state_|. 171 // Must be destroyed after |local_state_|.
170 // This is a stub when policy is not enabled. Otherwise, the PolicyService 172 // This is a stub when policy is not enabled. Otherwise, the PolicyService
171 // is owned by the |browser_policy_connector_| and this is not used. 173 // is owned by the |browser_policy_connector_| and this is not used.
172 scoped_ptr<policy::PolicyService> policy_service_; 174 scoped_ptr<policy::PolicyService> policy_service_;
173 175
174 bool created_profile_manager_; 176 bool created_profile_manager_;
175 scoped_ptr<ProfileManager> profile_manager_; 177 scoped_ptr<ProfileManager> profile_manager_;
176 178
177 bool created_local_state_; 179 bool created_local_state_;
178 scoped_ptr<PrefServiceSimple> local_state_; 180 scoped_ptr<PrefService> local_state_;
179 181
180 bool created_icon_manager_; 182 bool created_icon_manager_;
181 scoped_ptr<IconManager> icon_manager_; 183 scoped_ptr<IconManager> icon_manager_;
182 184
183 scoped_ptr<GLStringManager> gl_string_manager_; 185 scoped_ptr<GLStringManager> gl_string_manager_;
184 186
185 scoped_refptr<extensions::EventRouterForwarder> 187 scoped_refptr<extensions::EventRouterForwarder>
186 extension_event_router_forwarder_; 188 extension_event_router_forwarder_;
187 189
188 #if !defined(OS_ANDROID) 190 #if !defined(OS_ANDROID)
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 #endif 290 #endif
289 291
290 // TODO(eroman): Remove this when done debugging 113031. This tracks 292 // TODO(eroman): Remove this when done debugging 113031. This tracks
291 // the callstack which released the final module reference count. 293 // the callstack which released the final module reference count.
292 base::debug::StackTrace release_last_reference_callstack_; 294 base::debug::StackTrace release_last_reference_callstack_;
293 295
294 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl); 296 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
295 }; 297 };
296 298
297 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 299 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698