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

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

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 7 years, 12 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/browser_process.h ('k') | chrome/browser/browser_process_impl.cc » ('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 // 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 29
29 #if defined(ENABLE_PLUGIN_INSTALLATION) 30 #if defined(ENABLE_PLUGIN_INSTALLATION)
30 class PluginsResourceService; 31 class PluginsResourceService;
31 #endif 32 #endif
32 33
33 namespace base { 34 namespace base {
34 class SequencedTaskRunner; 35 class SequencedTaskRunner;
35 } 36 }
36 37
37 namespace policy { 38 namespace policy {
(...skipping 29 matching lines...) Expand all
67 void StartTearDown(); 68 void StartTearDown();
68 void PostDestroyThreads(); 69 void PostDestroyThreads();
69 70
70 // BrowserProcess implementation. 71 // BrowserProcess implementation.
71 virtual void ResourceDispatcherHostCreated() OVERRIDE; 72 virtual void ResourceDispatcherHostCreated() OVERRIDE;
72 virtual void EndSession() OVERRIDE; 73 virtual void EndSession() OVERRIDE;
73 virtual MetricsService* metrics_service() OVERRIDE; 74 virtual MetricsService* metrics_service() OVERRIDE;
74 virtual IOThread* io_thread() OVERRIDE; 75 virtual IOThread* io_thread() OVERRIDE;
75 virtual WatchDogThread* watchdog_thread() OVERRIDE; 76 virtual WatchDogThread* watchdog_thread() OVERRIDE;
76 virtual ProfileManager* profile_manager() OVERRIDE; 77 virtual ProfileManager* profile_manager() OVERRIDE;
77 virtual PrefService* local_state() OVERRIDE; 78 virtual PrefServiceSimple* local_state() OVERRIDE;
78 virtual net::URLRequestContextGetter* system_request_context() OVERRIDE; 79 virtual net::URLRequestContextGetter* system_request_context() OVERRIDE;
79 virtual chrome_variations::VariationsService* variations_service() OVERRIDE; 80 virtual chrome_variations::VariationsService* variations_service() OVERRIDE;
80 #if defined(OS_CHROMEOS) 81 #if defined(OS_CHROMEOS)
81 virtual chromeos::OomPriorityManager* oom_priority_manager() OVERRIDE; 82 virtual chromeos::OomPriorityManager* oom_priority_manager() OVERRIDE;
82 #endif // defined(OS_CHROMEOS) 83 #endif // defined(OS_CHROMEOS)
83 virtual extensions::EventRouterForwarder* 84 virtual extensions::EventRouterForwarder*
84 extension_event_router_forwarder() OVERRIDE; 85 extension_event_router_forwarder() OVERRIDE;
85 virtual NotificationUIManager* notification_ui_manager() OVERRIDE; 86 virtual NotificationUIManager* notification_ui_manager() OVERRIDE;
86 virtual policy::BrowserPolicyConnector* browser_policy_connector() OVERRIDE; 87 virtual policy::BrowserPolicyConnector* browser_policy_connector() OVERRIDE;
87 virtual policy::PolicyService* policy_service() OVERRIDE; 88 virtual policy::PolicyService* policy_service() OVERRIDE;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 168
168 // Must be destroyed after |local_state_|. 169 // Must be destroyed after |local_state_|.
169 // This is a stub when policy is not enabled. Otherwise, the PolicyService 170 // This is a stub when policy is not enabled. Otherwise, the PolicyService
170 // is owned by the |browser_policy_connector_| and this is not used. 171 // is owned by the |browser_policy_connector_| and this is not used.
171 scoped_ptr<policy::PolicyService> policy_service_; 172 scoped_ptr<policy::PolicyService> policy_service_;
172 173
173 bool created_profile_manager_; 174 bool created_profile_manager_;
174 scoped_ptr<ProfileManager> profile_manager_; 175 scoped_ptr<ProfileManager> profile_manager_;
175 176
176 bool created_local_state_; 177 bool created_local_state_;
177 scoped_ptr<PrefService> local_state_; 178 scoped_ptr<PrefServiceSimple> local_state_;
178 179
179 bool created_icon_manager_; 180 bool created_icon_manager_;
180 scoped_ptr<IconManager> icon_manager_; 181 scoped_ptr<IconManager> icon_manager_;
181 182
182 scoped_ptr<GLStringManager> gl_string_manager_; 183 scoped_ptr<GLStringManager> gl_string_manager_;
183 184
184 scoped_refptr<extensions::EventRouterForwarder> 185 scoped_refptr<extensions::EventRouterForwarder>
185 extension_event_router_forwarder_; 186 extension_event_router_forwarder_;
186 187
187 #if !defined(OS_ANDROID) 188 #if !defined(OS_ANDROID)
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 #endif 288 #endif
288 289
289 // TODO(eroman): Remove this when done debugging 113031. This tracks 290 // TODO(eroman): Remove this when done debugging 113031. This tracks
290 // the callstack which released the final module reference count. 291 // the callstack which released the final module reference count.
291 base::debug::StackTrace release_last_reference_callstack_; 292 base::debug::StackTrace release_last_reference_callstack_;
292 293
293 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl); 294 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
294 }; 295 };
295 296
296 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 297 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/browser_process.h ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698