| 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 10 matching lines...) Expand all Loading... |
| 21 #include "base/threading/thread_restrictions.h" | 21 #include "base/threading/thread_restrictions.h" |
| 22 #include "base/utf_string_conversions.h" | 22 #include "base/utf_string_conversions.h" |
| 23 #include "chrome/browser/automation/automation_provider.h" | 23 #include "chrome/browser/automation/automation_provider.h" |
| 24 #include "chrome/browser/automation/automation_provider_list.h" | 24 #include "chrome/browser/automation/automation_provider_list.h" |
| 25 #include "chrome/browser/automation/chrome_frame_automation_provider.h" | 25 #include "chrome/browser/automation/chrome_frame_automation_provider.h" |
| 26 #include "chrome/browser/automation/testing_automation_provider.h" | 26 #include "chrome/browser/automation/testing_automation_provider.h" |
| 27 #include "chrome/browser/browser_process.h" | 27 #include "chrome/browser/browser_process.h" |
| 28 #include "chrome/browser/component_updater/component_updater_service.h" | 28 #include "chrome/browser/component_updater/component_updater_service.h" |
| 29 #include "chrome/browser/component_updater/flash_component_installer.h" | 29 #include "chrome/browser/component_updater/flash_component_installer.h" |
| 30 #include "chrome/browser/component_updater/recovery_component_installer.h" | 30 #include "chrome/browser/component_updater/recovery_component_installer.h" |
| 31 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
| 31 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 32 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| 32 #include "chrome/browser/defaults.h" | 33 #include "chrome/browser/defaults.h" |
| 33 #include "chrome/browser/extensions/extension_creator.h" | 34 #include "chrome/browser/extensions/extension_creator.h" |
| 34 #include "chrome/browser/extensions/extension_service.h" | 35 #include "chrome/browser/extensions/extension_service.h" |
| 35 #include "chrome/browser/extensions/pack_extension_job.h" | 36 #include "chrome/browser/extensions/pack_extension_job.h" |
| 36 #include "chrome/browser/first_run/first_run.h" | 37 #include "chrome/browser/first_run/first_run.h" |
| 37 #include "chrome/browser/infobars/infobar_tab_helper.h" | 38 #include "chrome/browser/infobars/infobar_tab_helper.h" |
| 38 #include "chrome/browser/net/crl_set_fetcher.h" | 39 #include "chrome/browser/net/crl_set_fetcher.h" |
| 39 #include "chrome/browser/net/predictor.h" | 40 #include "chrome/browser/net/predictor.h" |
| 40 #include "chrome/browser/net/url_fixer_upper.h" | 41 #include "chrome/browser/net/url_fixer_upper.h" |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 477 void RegisterComponentsForUpdate(const CommandLine& command_line) { | 478 void RegisterComponentsForUpdate(const CommandLine& command_line) { |
| 478 ComponentUpdateService* cus = g_browser_process->component_updater(); | 479 ComponentUpdateService* cus = g_browser_process->component_updater(); |
| 479 if (!cus) | 480 if (!cus) |
| 480 return; | 481 return; |
| 481 // Registration can be before of after cus->Start() so it is ok to post | 482 // Registration can be before of after cus->Start() so it is ok to post |
| 482 // a task to the UI thread to do registration once you done the necessary | 483 // a task to the UI thread to do registration once you done the necessary |
| 483 // file IO to know you existing component version. | 484 // file IO to know you existing component version. |
| 484 RegisterRecoveryComponent(cus, g_browser_process->local_state()); | 485 RegisterRecoveryComponent(cus, g_browser_process->local_state()); |
| 485 RegisterPepperFlashComponent(cus); | 486 RegisterPepperFlashComponent(cus); |
| 486 RegisterNPAPIFlashComponent(cus); | 487 RegisterNPAPIFlashComponent(cus); |
| 488 RegisterSwiftShaderComponent(cus); |
| 487 | 489 |
| 488 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 490 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
| 489 // network. | 491 // network. |
| 490 if (command_line.HasSwitch(switches::kEnableCRLSets)) | 492 if (command_line.HasSwitch(switches::kEnableCRLSets)) |
| 491 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); | 493 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); |
| 492 | 494 |
| 493 cus->Start(); | 495 cus->Start(); |
| 494 } | 496 } |
| 495 | 497 |
| 496 } // namespace | 498 } // namespace |
| (...skipping 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1524 | 1526 |
| 1525 Profile* profile = ProfileManager::GetLastUsedProfile(); | 1527 Profile* profile = ProfileManager::GetLastUsedProfile(); |
| 1526 if (!profile) { | 1528 if (!profile) { |
| 1527 // We should only be able to get here if the profile already exists and | 1529 // We should only be able to get here if the profile already exists and |
| 1528 // has been created. | 1530 // has been created. |
| 1529 NOTREACHED(); | 1531 NOTREACHED(); |
| 1530 return; | 1532 return; |
| 1531 } | 1533 } |
| 1532 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, NULL, NULL); | 1534 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, NULL, NULL); |
| 1533 } | 1535 } |
| OLD | NEW |