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

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

Issue 13071002: Turn on component updater on chromeos, only for the pnacl component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: debug Created 7 years, 8 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_
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 safe_browsing_detection_service() OVERRIDE; 125 safe_browsing_detection_service() OVERRIDE;
126 126
127 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 127 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
128 virtual void StartAutoupdateTimer() OVERRIDE; 128 virtual void StartAutoupdateTimer() OVERRIDE;
129 #endif 129 #endif
130 130
131 virtual ChromeNetLog* net_log() OVERRIDE; 131 virtual ChromeNetLog* net_log() OVERRIDE;
132 virtual prerender::PrerenderTracker* prerender_tracker() OVERRIDE; 132 virtual prerender::PrerenderTracker* prerender_tracker() OVERRIDE;
133 virtual ComponentUpdateService* component_updater() OVERRIDE; 133 virtual ComponentUpdateService* component_updater() OVERRIDE;
134 virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE; 134 virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
135 virtual PnaclComponentInstaller* pnacl_component_installer() OVERRIDE;
135 virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE; 136 virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE;
136 virtual chrome::MediaFileSystemRegistry* 137 virtual chrome::MediaFileSystemRegistry*
137 media_file_system_registry() OVERRIDE; 138 media_file_system_registry() OVERRIDE;
138 virtual void PlatformSpecificCommandLineProcessing( 139 virtual void PlatformSpecificCommandLineProcessing(
139 const CommandLine& command_line) OVERRIDE; 140 const CommandLine& command_line) OVERRIDE;
140 virtual bool created_local_state() const OVERRIDE; 141 virtual bool created_local_state() const OVERRIDE;
141 142
142 static void RegisterPrefs(PrefRegistrySimple* registry); 143 static void RegisterPrefs(PrefRegistrySimple* registry);
143 144
144 private: 145 private:
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 280
280 // Gets called by autoupdate timer to see if browser needs restart and can be 281 // Gets called by autoupdate timer to see if browser needs restart and can be
281 // restarted, and if that's the case, restarts the browser. 282 // restarted, and if that's the case, restarts the browser.
282 void OnAutoupdateTimer(); 283 void OnAutoupdateTimer();
283 bool CanAutorestartForUpdate() const; 284 bool CanAutorestartForUpdate() const;
284 void RestartBackgroundInstance(); 285 void RestartBackgroundInstance();
285 #endif // defined(OS_WIN) || defined(OS_LINUX) && !defined(OS_CHROMEOS) 286 #endif // defined(OS_WIN) || defined(OS_LINUX) && !defined(OS_CHROMEOS)
286 287
287 #if defined(OS_CHROMEOS) 288 #if defined(OS_CHROMEOS)
288 scoped_ptr<chromeos::OomPriorityManager> oom_priority_manager_; 289 scoped_ptr<chromeos::OomPriorityManager> oom_priority_manager_;
289 #else 290 #endif
291 // component updater is normally not used under ChromeOS due
292 // to concerns over integrity of data shared between profiles,
293 // but some users of component updater only install per-user.
290 scoped_ptr<ComponentUpdateService> component_updater_; 294 scoped_ptr<ComponentUpdateService> component_updater_;
291
292 scoped_refptr<CRLSetFetcher> crl_set_fetcher_; 295 scoped_refptr<CRLSetFetcher> crl_set_fetcher_;
293 #endif 296 scoped_ptr<PnaclComponentInstaller> pnacl_component_installer_;
294 297
295 #if defined(ENABLE_PLUGIN_INSTALLATION) 298 #if defined(ENABLE_PLUGIN_INSTALLATION)
296 scoped_refptr<PluginsResourceService> plugins_resource_service_; 299 scoped_refptr<PluginsResourceService> plugins_resource_service_;
297 #endif 300 #endif
298 301
299 #if defined(OS_WIN) && defined(USE_AURA) 302 #if defined(OS_WIN) && defined(USE_AURA)
300 void PerformInitForWindowsAura(const CommandLine& command_line); 303 void PerformInitForWindowsAura(const CommandLine& command_line);
301 304
302 // Hosts the channel for the Windows 8 metro viewer process which runs in 305 // Hosts the channel for the Windows 8 metro viewer process which runs in
303 // the ASH environment. 306 // the ASH environment.
304 scoped_ptr<MetroViewerProcessHost> metro_viewer_process_host_; 307 scoped_ptr<MetroViewerProcessHost> metro_viewer_process_host_;
305 #endif 308 #endif
306 309
307 #if defined(OS_MACOSX) 310 #if defined(OS_MACOSX)
308 // Hosts the IPC channel factory that App Shims connect to on Mac. 311 // Hosts the IPC channel factory that App Shims connect to on Mac.
309 scoped_ptr<AppShimHostManager> app_shim_host_manager_; 312 scoped_ptr<AppShimHostManager> app_shim_host_manager_;
310 #endif 313 #endif
311 314
312 // TODO(eroman): Remove this when done debugging 113031. This tracks 315 // TODO(eroman): Remove this when done debugging 113031. This tracks
313 // the callstack which released the final module reference count. 316 // the callstack which released the final module reference count.
314 base::debug::StackTrace release_last_reference_callstack_; 317 base::debug::StackTrace release_last_reference_callstack_;
315 318
316 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl); 319 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
317 }; 320 };
318 321
319 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 322 #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