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

Unified Diff: chrome/browser/browser_process_impl.cc

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: fix race in observer vs cus setting, profile on UI thread 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index c86d034426271110a21bbac3cb6ed4202436e5ed..d6560abc88b3f94c555c623be35a3e7eca53b13c 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -27,6 +27,7 @@
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/component_updater/component_updater_configurator.h"
#include "chrome/browser/component_updater/component_updater_service.h"
+#include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
#include "chrome/browser/defaults.h"
#include "chrome/browser/devtools/remote_debugging_server.h"
#include "chrome/browser/download/download_request_limiter.h"
@@ -747,9 +748,6 @@ prerender::PrerenderTracker* BrowserProcessImpl::prerender_tracker() {
}
ComponentUpdateService* BrowserProcessImpl::component_updater() {
-#if defined(OS_CHROMEOS)
- return NULL;
-#else
if (!component_updater_.get()) {
ComponentUpdateService::Configurator* configurator =
MakeChromeComponentUpdaterConfigurator(
@@ -760,19 +758,18 @@ ComponentUpdateService* BrowserProcessImpl::component_updater() {
component_updater_.reset(ComponentUpdateServiceFactory(configurator));
}
return component_updater_.get();
-#endif
}
CRLSetFetcher* BrowserProcessImpl::crl_set_fetcher() {
-#if defined(OS_CHROMEOS)
- // There's no component updater on ChromeOS so there can't be a CRLSetFetcher
- // either.
- return NULL;
-#else
if (!crl_set_fetcher_.get())
crl_set_fetcher_ = new CRLSetFetcher();
return crl_set_fetcher_.get();
-#endif
+}
+
+PnaclComponentInstaller* BrowserProcessImpl::pnacl_component_installer() {
+ if (!pnacl_component_installer_.get())
+ pnacl_component_installer_.reset(new PnaclComponentInstaller());
+ return pnacl_component_installer_.get();
}
void BrowserProcessImpl::ResourceDispatcherHostCreated() {

Powered by Google App Engine
This is Rietveld 408576698