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

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: filepath Created 7 years, 9 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 00f01b8eb6c2ce439d73258cf374b57f35c5a881..0375d715d94feb93af39c03e8a491f0d37f665ff 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"
@@ -740,9 +741,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(
@@ -753,13 +751,13 @@ 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.
+ // There is component updater on ChromeOS, but it is only used when data
+ // is not shared between users. Currently not making a CRLSetFetcher
+ // component for ChromeOS.
cpu_(ooo_6.6-7.5) 2013/03/29 22:24:39 do we need this ifdef block? given that we aleady
jvoung (off chromium) 2013/03/29 22:54:52 Yeah, seems like we don't need to ifdef this anymo
jvoung (off chromium) 2013/03/29 23:22:40 Done -- also removed the null checks that I added
return NULL;
#else
if (!crl_set_fetcher_.get())
@@ -768,6 +766,12 @@ CRLSetFetcher* BrowserProcessImpl::crl_set_fetcher() {
#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() {
resource_dispatcher_host_delegate_.reset(
new ChromeResourceDispatcherHostDelegate(prerender_tracker()));

Powered by Google App Engine
This is Rietveld 408576698