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

Side by Side 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: check if logged in first to not waste early ping on the OTR profile 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 unified diff | Download patch | Annotate | Revision Log
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 #include "chrome/browser/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #if defined(TOOLKIT_GTK) 7 #if defined(TOOLKIT_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 } 473 }
474 } 474 }
475 475
476 void RegisterComponentsForUpdate(const CommandLine& command_line) { 476 void RegisterComponentsForUpdate(const CommandLine& command_line) {
477 ComponentUpdateService* cus = g_browser_process->component_updater(); 477 ComponentUpdateService* cus = g_browser_process->component_updater();
478 if (!cus) 478 if (!cus)
479 return; 479 return;
480 // Registration can be before of after cus->Start() so it is ok to post 480 // Registration can be before of after cus->Start() so it is ok to post
481 // a task to the UI thread to do registration once you done the necessary 481 // a task to the UI thread to do registration once you done the necessary
482 // file IO to know you existing component version. 482 // file IO to know you existing component version.
483 #if !defined(OS_CHROMEOS)
483 RegisterRecoveryComponent(cus, g_browser_process->local_state()); 484 RegisterRecoveryComponent(cus, g_browser_process->local_state());
484 RegisterPepperFlashComponent(cus); 485 RegisterPepperFlashComponent(cus);
485 RegisterSwiftShaderComponent(cus); 486 RegisterSwiftShaderComponent(cus);
486 487
487 // CRLSetFetcher attempts to load a CRL set from either the local disk or 488 // CRLSetFetcher attempts to load a CRL set from either the local disk or
488 // network. 489 // network.
489 if (!command_line.HasSwitch(switches::kDisableCRLSets)) 490 if (!command_line.HasSwitch(switches::kDisableCRLSets))
Dmitry Polukhin 2013/03/26 11:59:56 Nit, please add {} around inner if.
jvoung - send to chromium... 2013/03/26 15:46:53 Done.
490 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); 491 if (g_browser_process->crl_set_fetcher())
492 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus);
493 #endif
491 494
492 RegisterPnaclComponent(cus, command_line); 495 if (g_browser_process->pnacl_component_installer())
Dmitry Polukhin 2013/03/26 11:59:56 Nit, same here. If-body has more than 1 line so it
jvoung - send to chromium... 2013/03/26 15:46:53 Done.
496 g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(
497 cus, command_line);
493 498
494 cus->Start(); 499 cus->Start();
495 } 500 }
496 501
497 bool ProcessSingletonNotificationCallback( 502 bool ProcessSingletonNotificationCallback(
498 const CommandLine& command_line, 503 const CommandLine& command_line,
499 const base::FilePath& current_directory) { 504 const base::FilePath& current_directory) {
500 // Drop the request if the browser process is already in shutdown path. 505 // Drop the request if the browser process is already in shutdown path.
501 if (!g_browser_process || g_browser_process->IsShuttingDown()) 506 if (!g_browser_process || g_browser_process->IsShuttingDown())
502 return false; 507 return false;
(...skipping 1311 matching lines...) Expand 10 before | Expand all | Expand 10 after
1814 if (base::win::GetVersion() <= base::win::VERSION_XP) 1819 if (base::win::GetVersion() <= base::win::VERSION_XP)
1815 uma_name += "_XP"; 1820 uma_name += "_XP";
1816 1821
1817 uma_name += "_PreRead_"; 1822 uma_name += "_PreRead_";
1818 uma_name += pre_read_percentage; 1823 uma_name += pre_read_percentage;
1819 AddPreReadHistogramTime(uma_name.c_str(), time); 1824 AddPreReadHistogramTime(uma_name.c_str(), time);
1820 } 1825 }
1821 #endif 1826 #endif
1822 #endif 1827 #endif
1823 } 1828 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698