| 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 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 // file IO to know you existing component version. | 478 // file IO to know you existing component version. |
| 479 RegisterRecoveryComponent(cus, g_browser_process->local_state()); | 479 RegisterRecoveryComponent(cus, g_browser_process->local_state()); |
| 480 RegisterPepperFlashComponent(cus); | 480 RegisterPepperFlashComponent(cus); |
| 481 RegisterSwiftShaderComponent(cus); | 481 RegisterSwiftShaderComponent(cus); |
| 482 | 482 |
| 483 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 483 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
| 484 // network. | 484 // network. |
| 485 if (!command_line.HasSwitch(switches::kDisableCRLSets)) | 485 if (!command_line.HasSwitch(switches::kDisableCRLSets)) |
| 486 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); | 486 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); |
| 487 | 487 |
| 488 if (command_line.HasSwitch(switches::kEnablePnacl)) | 488 RegisterPnaclComponent(cus, command_line); |
| 489 RegisterPnaclComponent(cus); | |
| 490 | 489 |
| 491 cus->Start(); | 490 cus->Start(); |
| 492 } | 491 } |
| 493 | 492 |
| 494 bool ProcessSingletonNotificationCallback( | 493 bool ProcessSingletonNotificationCallback( |
| 495 const CommandLine& command_line, | 494 const CommandLine& command_line, |
| 496 const base::FilePath& current_directory) { | 495 const base::FilePath& current_directory) { |
| 497 // Drop the request if the browser process is already in shutdown path. | 496 // Drop the request if the browser process is already in shutdown path. |
| 498 if (!g_browser_process || g_browser_process->IsShuttingDown()) | 497 if (!g_browser_process || g_browser_process->IsShuttingDown()) |
| 499 return false; | 498 return false; |
| (...skipping 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1783 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1782 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 1784 uma_name += "_XP"; | 1783 uma_name += "_XP"; |
| 1785 | 1784 |
| 1786 uma_name += "_PreRead_"; | 1785 uma_name += "_PreRead_"; |
| 1787 uma_name += pre_read_percentage; | 1786 uma_name += pre_read_percentage; |
| 1788 AddPreReadHistogramTime(uma_name.c_str(), time); | 1787 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 1789 } | 1788 } |
| 1790 #endif | 1789 #endif |
| 1791 #endif | 1790 #endif |
| 1792 } | 1791 } |
| OLD | NEW |