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

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

Issue 11299192: Ensure that Metro chrome in ASH is able to connect to an existing desktop chrome AURA process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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_
(...skipping 21 matching lines...) Expand all
32 32
33 namespace base { 33 namespace base {
34 class SequencedTaskRunner; 34 class SequencedTaskRunner;
35 } 35 }
36 36
37 namespace policy { 37 namespace policy {
38 class BrowserPolicyConnector; 38 class BrowserPolicyConnector;
39 class PolicyService; 39 class PolicyService;
40 }; 40 };
41 41
42 #if defined(OS_WIN) && defined(USE_AURA)
43 class MetroViewerProcessHost;
44 #endif
45
42 // Real implementation of BrowserProcess that creates and returns the services. 46 // Real implementation of BrowserProcess that creates and returns the services.
43 class BrowserProcessImpl : public BrowserProcess, 47 class BrowserProcessImpl : public BrowserProcess,
44 public base::NonThreadSafe { 48 public base::NonThreadSafe {
45 public: 49 public:
46 // |local_state_task_runner| must be a shutdown-blocking task runner. 50 // |local_state_task_runner| must be a shutdown-blocking task runner.
47 BrowserProcessImpl(base::SequencedTaskRunner* local_state_task_runner, 51 BrowserProcessImpl(base::SequencedTaskRunner* local_state_task_runner,
48 const CommandLine& command_line); 52 const CommandLine& command_line);
49 virtual ~BrowserProcessImpl(); 53 virtual ~BrowserProcessImpl();
50 54
51 // Called before the browser threads are created. 55 // Called before the browser threads are created.
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 114
111 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 115 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
112 virtual void StartAutoupdateTimer() OVERRIDE; 116 virtual void StartAutoupdateTimer() OVERRIDE;
113 #endif 117 #endif
114 118
115 virtual ChromeNetLog* net_log() OVERRIDE; 119 virtual ChromeNetLog* net_log() OVERRIDE;
116 virtual prerender::PrerenderTracker* prerender_tracker() OVERRIDE; 120 virtual prerender::PrerenderTracker* prerender_tracker() OVERRIDE;
117 virtual ComponentUpdateService* component_updater() OVERRIDE; 121 virtual ComponentUpdateService* component_updater() OVERRIDE;
118 virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE; 122 virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
119 virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE; 123 virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE;
124 virtual void PlatformSpecificCommandLineProcessing(
125 const CommandLine& command_line) OVERRIDE;
120 126
121 private: 127 private:
122 void CreateMetricsService(); 128 void CreateMetricsService();
123 void CreateWatchdogThread(); 129 void CreateWatchdogThread();
124 #if defined(OS_CHROMEOS) 130 #if defined(OS_CHROMEOS)
125 void InitializeWebSocketProxyThread(); 131 void InitializeWebSocketProxyThread();
126 #endif 132 #endif
127 void CreateProfileManager(); 133 void CreateProfileManager();
128 void CreateLocalState(); 134 void CreateLocalState();
129 void CreateViewedPageTracker(); 135 void CreateViewedPageTracker();
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 scoped_ptr<chromeos::OomPriorityManager> oom_priority_manager_; 263 scoped_ptr<chromeos::OomPriorityManager> oom_priority_manager_;
258 #else 264 #else
259 scoped_ptr<ComponentUpdateService> component_updater_; 265 scoped_ptr<ComponentUpdateService> component_updater_;
260 266
261 scoped_refptr<CRLSetFetcher> crl_set_fetcher_; 267 scoped_refptr<CRLSetFetcher> crl_set_fetcher_;
262 #endif 268 #endif
263 269
264 #if defined(ENABLE_PLUGIN_INSTALLATION) 270 #if defined(ENABLE_PLUGIN_INSTALLATION)
265 scoped_refptr<PluginsResourceService> plugins_resource_service_; 271 scoped_refptr<PluginsResourceService> plugins_resource_service_;
266 #endif 272 #endif
273
274 #if defined(OS_WIN) && defined(USE_AURA)
275 void PerformInitForWindowsAura(const CommandLine& command_line);
Ben Goodger (Google) 2012/11/27 16:56:41 nit: NL after
ananta 2012/11/27 19:16:03 Done.
276 // Hosts the channel for the Windows 8 metro viewer process which runs in
277 // the ASH environment.
278 scoped_ptr<MetroViewerProcessHost> metro_viewer_process_host_;
279 #endif
280
267 // TODO(eroman): Remove this when done debugging 113031. This tracks 281 // TODO(eroman): Remove this when done debugging 113031. This tracks
268 // the callstack which released the final module reference count. 282 // the callstack which released the final module reference count.
269 base::debug::StackTrace release_last_reference_callstack_; 283 base::debug::StackTrace release_last_reference_callstack_;
270 284
271 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl); 285 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
272 }; 286 };
273 287
274 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 288 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698