summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_process_impl.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/browser_process_impl.h')
-rw-r--r--chrome/browser/browser_process_impl.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 93d1901..0d2199f 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -132,7 +132,6 @@ class BrowserProcessImpl : public BrowserProcess,
virtual prerender::PrerenderTracker* prerender_tracker() OVERRIDE;
virtual ComponentUpdateService* component_updater() OVERRIDE;
virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
- virtual PnaclComponentInstaller* pnacl_component_installer() OVERRIDE;
virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE;
virtual chrome::MediaFileSystemRegistry*
media_file_system_registry() OVERRIDE;
@@ -287,13 +286,11 @@ class BrowserProcessImpl : public BrowserProcess,
#if defined(OS_CHROMEOS)
scoped_ptr<chromeos::OomPriorityManager> oom_priority_manager_;
-#endif
- // component updater is normally not used under ChromeOS due
- // to concerns over integrity of data shared between profiles,
- // but some users of component updater only install per-user.
+#else
scoped_ptr<ComponentUpdateService> component_updater_;
+
scoped_refptr<CRLSetFetcher> crl_set_fetcher_;
- scoped_ptr<PnaclComponentInstaller> pnacl_component_installer_;
+#endif
#if defined(ENABLE_PLUGIN_INSTALLATION)
scoped_refptr<PluginsResourceService> plugins_resource_service_;