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

Unified Diff: chrome/browser/chrome_browser_main.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: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index a8abe1546820d51326fa8440b48b40eeace75e44..ddf00ea60eab2c44ff91122135fac152f44d1c17 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -448,11 +448,11 @@ void RecordTouchEventState(const CommandLine& command_line) {
void RegisterComponentsForUpdate(const CommandLine& command_line) {
ComponentUpdateService* cus = g_browser_process->component_updater();
- if (!cus)
- return;
- // Registration can be before of after cus->Start() so it is ok to post
+
+ // Registration can be before or after cus->Start() so it is ok to post
// a task to the UI thread to do registration once you done the necessary
// file IO to know you existing component version.
+#if !defined(OS_CHROMEOS)
RegisterRecoveryComponent(cus, g_browser_process->local_state());
RegisterPepperFlashComponent(cus);
RegisterSwiftShaderComponent(cus);
@@ -461,8 +461,10 @@ void RegisterComponentsForUpdate(const CommandLine& command_line) {
// network.
if (!command_line.HasSwitch(switches::kDisableCRLSets))
g_browser_process->crl_set_fetcher()->StartInitialLoad(cus);
+#endif
- RegisterPnaclComponent(cus, command_line);
+ g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(
+ cus, command_line);
cus->Start();
}
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/component_updater/pnacl/pnacl_component_installer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698