Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 393 name, kMin, kMax, kBuckets, base::Histogram::kUmaTargetedHistogramFlag); | 393 name, kMin, kMax, kBuckets, base::Histogram::kUmaTargetedHistogramFlag); |
| 394 | 394 |
| 395 counter->AddTime(time); | 395 counter->AddTime(time); |
| 396 } | 396 } |
| 397 | 397 |
| 398 void RegisterComponentsForUpdate(const CommandLine& command_line) { | 398 void RegisterComponentsForUpdate(const CommandLine& command_line) { |
| 399 ComponentUpdateService* cus = g_browser_process->component_updater(); | 399 ComponentUpdateService* cus = g_browser_process->component_updater(); |
| 400 | 400 |
| 401 // Registration can be before or after cus->Start() so it is ok to post | 401 // Registration can be before or after cus->Start() so it is ok to post |
| 402 // a task to the UI thread to do registration once you done the necessary | 402 // a task to the UI thread to do registration once you done the necessary |
| 403 // file IO to know you existing component version. | 403 // file IO to know your existing component version. |
|
cpu_(ooo_6.6-7.5)
2013/05/29 20:06:44
remove this file from the CL. you can TBR=cpu this
waffles
2013/06/13 20:55:04
Done.
| |
| 404 #if !defined(OS_CHROMEOS) | 404 #if !defined(OS_CHROMEOS) |
| 405 RegisterRecoveryComponent(cus, g_browser_process->local_state()); | 405 RegisterRecoveryComponent(cus, g_browser_process->local_state()); |
| 406 RegisterPepperFlashComponent(cus); | 406 RegisterPepperFlashComponent(cus); |
| 407 RegisterSwiftShaderComponent(cus); | 407 RegisterSwiftShaderComponent(cus); |
| 408 RegisterWidevineCdmComponent(cus); | 408 RegisterWidevineCdmComponent(cus); |
| 409 | 409 |
| 410 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 410 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
| 411 // network. | 411 // network. |
| 412 if (!command_line.HasSwitch(switches::kDisableCRLSets)) | 412 if (!command_line.HasSwitch(switches::kDisableCRLSets)) |
| 413 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); | 413 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); |
| (...skipping 1395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1809 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1809 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 1810 uma_name += "_XP"; | 1810 uma_name += "_XP"; |
| 1811 | 1811 |
| 1812 uma_name += "_PreRead_"; | 1812 uma_name += "_PreRead_"; |
| 1813 uma_name += pre_read_percentage; | 1813 uma_name += pre_read_percentage; |
| 1814 AddPreReadHistogramTime(uma_name.c_str(), time); | 1814 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 1815 } | 1815 } |
| 1816 #endif | 1816 #endif |
| 1817 #endif | 1817 #endif |
| 1818 } | 1818 } |
| OLD | NEW |