| 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/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/environment.h" | 10 #include "base/environment.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 #include "chrome/browser/ui/webui/sync_promo_ui.h" | 62 #include "chrome/browser/ui/webui/sync_promo_ui.h" |
| 63 #include "chrome/common/chrome_constants.h" | 63 #include "chrome/common/chrome_constants.h" |
| 64 #include "chrome/common/chrome_paths.h" | 64 #include "chrome/common/chrome_paths.h" |
| 65 #include "chrome/common/chrome_result_codes.h" | 65 #include "chrome/common/chrome_result_codes.h" |
| 66 #include "chrome/common/chrome_switches.h" | 66 #include "chrome/common/chrome_switches.h" |
| 67 #include "chrome/common/chrome_version_info.h" | 67 #include "chrome/common/chrome_version_info.h" |
| 68 #include "chrome/common/extensions/extension_constants.h" | 68 #include "chrome/common/extensions/extension_constants.h" |
| 69 #include "chrome/common/pref_names.h" | 69 #include "chrome/common/pref_names.h" |
| 70 #include "chrome/common/url_constants.h" | 70 #include "chrome/common/url_constants.h" |
| 71 #include "chrome/installer/util/browser_distribution.h" | 71 #include "chrome/installer/util/browser_distribution.h" |
| 72 #include "chrome/nacl/pnacl_component_installer.h" |
| 72 #include "content/browser/child_process_security_policy.h" | 73 #include "content/browser/child_process_security_policy.h" |
| 73 #include "content/browser/tab_contents/navigation_details.h" | 74 #include "content/browser/tab_contents/navigation_details.h" |
| 74 #include "content/browser/tab_contents/tab_contents_view.h" | 75 #include "content/browser/tab_contents/tab_contents_view.h" |
| 75 #include "content/public/browser/browser_thread.h" | 76 #include "content/public/browser/browser_thread.h" |
| 76 #include "grit/chromium_strings.h" | 77 #include "grit/chromium_strings.h" |
| 77 #include "grit/generated_resources.h" | 78 #include "grit/generated_resources.h" |
| 78 #include "grit/locale_settings.h" | 79 #include "grit/locale_settings.h" |
| 79 #include "grit/theme_resources.h" | 80 #include "grit/theme_resources.h" |
| 80 #include "grit/theme_resources_standard.h" | 81 #include "grit/theme_resources_standard.h" |
| 81 #include "net/base/net_util.h" | 82 #include "net/base/net_util.h" |
| (...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 // file IO to know you existing component version. | 538 // file IO to know you existing component version. |
| 538 RegisterRecoveryComponent(cus, g_browser_process->local_state()); | 539 RegisterRecoveryComponent(cus, g_browser_process->local_state()); |
| 539 RegisterPepperFlashComponent(cus); | 540 RegisterPepperFlashComponent(cus); |
| 540 RegisterNPAPIFlashComponent(cus); | 541 RegisterNPAPIFlashComponent(cus); |
| 541 | 542 |
| 542 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 543 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
| 543 // network. | 544 // network. |
| 544 if (command_line.HasSwitch(switches::kEnableCRLSets)) | 545 if (command_line.HasSwitch(switches::kEnableCRLSets)) |
| 545 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); | 546 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); |
| 546 | 547 |
| 548 // This developer version of Pnacl should only be installed for developers. |
| 549 if (command_line.HasSwitch(switches::kEnablePnacl)) { |
| 550 RegisterPnaclComponent(cus); |
| 551 } |
| 552 |
| 547 cus->Start(); | 553 cus->Start(); |
| 548 } | 554 } |
| 549 | 555 |
| 550 } // namespace | 556 } // namespace |
| 551 | 557 |
| 552 | 558 |
| 553 // BrowserInit ---------------------------------------------------------------- | 559 // BrowserInit ---------------------------------------------------------------- |
| 554 | 560 |
| 555 BrowserInit::BrowserInit() {} | 561 BrowserInit::BrowserInit() {} |
| 556 | 562 |
| (...skipping 992 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1549 if (!automation->InitializeChannel(channel_id)) | 1555 if (!automation->InitializeChannel(channel_id)) |
| 1550 return false; | 1556 return false; |
| 1551 automation->SetExpectedTabCount(expected_tabs); | 1557 automation->SetExpectedTabCount(expected_tabs); |
| 1552 | 1558 |
| 1553 AutomationProviderList* list = g_browser_process->GetAutomationProviderList(); | 1559 AutomationProviderList* list = g_browser_process->GetAutomationProviderList(); |
| 1554 DCHECK(list); | 1560 DCHECK(list); |
| 1555 list->AddProvider(automation); | 1561 list->AddProvider(automation); |
| 1556 | 1562 |
| 1557 return true; | 1563 return true; |
| 1558 } | 1564 } |
| OLD | NEW |