OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/browser_init.h" | 5 #include "chrome/browser/ui/browser_init.h" |
6 | 6 |
7 #include <algorithm> // For max(). | 7 #include <algorithm> // For max(). |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "base/utf_string_conversions.h" | 22 #include "base/utf_string_conversions.h" |
23 #include "chrome/browser/auto_launch_trial.h" | 23 #include "chrome/browser/auto_launch_trial.h" |
24 #include "chrome/browser/automation/automation_provider.h" | 24 #include "chrome/browser/automation/automation_provider.h" |
25 #include "chrome/browser/automation/automation_provider_list.h" | 25 #include "chrome/browser/automation/automation_provider_list.h" |
26 #include "chrome/browser/automation/chrome_frame_automation_provider.h" | 26 #include "chrome/browser/automation/chrome_frame_automation_provider.h" |
27 #include "chrome/browser/automation/testing_automation_provider.h" | 27 #include "chrome/browser/automation/testing_automation_provider.h" |
28 #include "chrome/browser/browser_process.h" | 28 #include "chrome/browser/browser_process.h" |
29 #include "chrome/browser/component_updater/component_updater_service.h" | 29 #include "chrome/browser/component_updater/component_updater_service.h" |
30 #include "chrome/browser/component_updater/flash_component_installer.h" | 30 #include "chrome/browser/component_updater/flash_component_installer.h" |
31 #include "chrome/browser/component_updater/recovery_component_installer.h" | 31 #include "chrome/browser/component_updater/recovery_component_installer.h" |
| 32 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
32 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 33 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
33 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 34 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
34 #include "chrome/browser/defaults.h" | 35 #include "chrome/browser/defaults.h" |
35 #include "chrome/browser/extensions/extension_creator.h" | 36 #include "chrome/browser/extensions/extension_creator.h" |
36 #include "chrome/browser/extensions/extension_service.h" | 37 #include "chrome/browser/extensions/extension_service.h" |
37 #include "chrome/browser/extensions/pack_extension_job.h" | 38 #include "chrome/browser/extensions/pack_extension_job.h" |
38 #include "chrome/browser/first_run/first_run.h" | 39 #include "chrome/browser/first_run/first_run.h" |
39 #include "chrome/browser/infobars/infobar_tab_helper.h" | 40 #include "chrome/browser/infobars/infobar_tab_helper.h" |
40 #include "chrome/browser/net/crl_set_fetcher.h" | 41 #include "chrome/browser/net/crl_set_fetcher.h" |
41 #include "chrome/browser/net/predictor.h" | 42 #include "chrome/browser/net/predictor.h" |
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
616 void RegisterComponentsForUpdate(const CommandLine& command_line) { | 617 void RegisterComponentsForUpdate(const CommandLine& command_line) { |
617 ComponentUpdateService* cus = g_browser_process->component_updater(); | 618 ComponentUpdateService* cus = g_browser_process->component_updater(); |
618 if (!cus) | 619 if (!cus) |
619 return; | 620 return; |
620 // Registration can be before of after cus->Start() so it is ok to post | 621 // Registration can be before of after cus->Start() so it is ok to post |
621 // a task to the UI thread to do registration once you done the necessary | 622 // a task to the UI thread to do registration once you done the necessary |
622 // file IO to know you existing component version. | 623 // file IO to know you existing component version. |
623 RegisterRecoveryComponent(cus, g_browser_process->local_state()); | 624 RegisterRecoveryComponent(cus, g_browser_process->local_state()); |
624 RegisterPepperFlashComponent(cus); | 625 RegisterPepperFlashComponent(cus); |
625 RegisterNPAPIFlashComponent(cus); | 626 RegisterNPAPIFlashComponent(cus); |
| 627 RegisterSwiftShaderComponent(cus); |
626 | 628 |
627 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 629 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
628 // network. | 630 // network. |
629 if (command_line.HasSwitch(switches::kEnableCRLSets)) | 631 if (command_line.HasSwitch(switches::kEnableCRLSets)) |
630 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); | 632 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); |
631 | 633 |
632 // This developer version of Pnacl should only be installed for developers. | 634 // This developer version of Pnacl should only be installed for developers. |
633 if (command_line.HasSwitch(switches::kEnablePnacl)) { | 635 if (command_line.HasSwitch(switches::kEnablePnacl)) { |
634 RegisterPnaclComponent(cus); | 636 RegisterPnaclComponent(cus); |
635 } | 637 } |
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1706 | 1708 |
1707 Profile* profile = ProfileManager::GetLastUsedProfile(); | 1709 Profile* profile = ProfileManager::GetLastUsedProfile(); |
1708 if (!profile) { | 1710 if (!profile) { |
1709 // We should only be able to get here if the profile already exists and | 1711 // We should only be able to get here if the profile already exists and |
1710 // has been created. | 1712 // has been created. |
1711 NOTREACHED(); | 1713 NOTREACHED(); |
1712 return; | 1714 return; |
1713 } | 1715 } |
1714 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, NULL, NULL); | 1716 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, NULL, NULL); |
1715 } | 1717 } |
OLD | NEW |