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 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 27 matching lines...) Expand all Loading... |
38 #include "build/build_config.h" | 38 #include "build/build_config.h" |
39 #include "chrome/browser/about_flags.h" | 39 #include "chrome/browser/about_flags.h" |
40 #include "chrome/browser/browser_process.h" | 40 #include "chrome/browser/browser_process.h" |
41 #include "chrome/browser/browser_process_impl.h" | 41 #include "chrome/browser/browser_process_impl.h" |
42 #include "chrome/browser/browser_process_platform_part.h" | 42 #include "chrome/browser/browser_process_platform_part.h" |
43 #include "chrome/browser/browser_shutdown.h" | 43 #include "chrome/browser/browser_shutdown.h" |
44 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 44 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
45 #include "chrome/browser/component_updater/cld_component_installer.h" | 45 #include "chrome/browser/component_updater/cld_component_installer.h" |
46 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" | 46 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" |
47 #include "chrome/browser/component_updater/flash_component_installer.h" | 47 #include "chrome/browser/component_updater/flash_component_installer.h" |
48 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | |
49 #include "chrome/browser/component_updater/recovery_component_installer.h" | 48 #include "chrome/browser/component_updater/recovery_component_installer.h" |
50 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 49 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
51 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 50 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
52 #include "chrome/browser/defaults.h" | 51 #include "chrome/browser/defaults.h" |
53 #include "chrome/browser/extensions/extension_service.h" | 52 #include "chrome/browser/extensions/extension_service.h" |
54 #include "chrome/browser/extensions/startup_helper.h" | 53 #include "chrome/browser/extensions/startup_helper.h" |
55 #include "chrome/browser/first_run/first_run.h" | 54 #include "chrome/browser/first_run/first_run.h" |
56 #include "chrome/browser/first_run/upgrade_util.h" | 55 #include "chrome/browser/first_run/upgrade_util.h" |
57 #include "chrome/browser/google/google_search_counter.h" | 56 #include "chrome/browser/google/google_search_counter.h" |
58 #include "chrome/browser/gpu/gl_string_manager.h" | 57 #include "chrome/browser/gpu/gl_string_manager.h" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 #endif // defined(OS_WIN) | 178 #endif // defined(OS_WIN) |
180 | 179 |
181 #if defined(OS_MACOSX) | 180 #if defined(OS_MACOSX) |
182 #include <Security/Security.h> | 181 #include <Security/Security.h> |
183 | 182 |
184 #include "base/mac/scoped_nsautorelease_pool.h" | 183 #include "base/mac/scoped_nsautorelease_pool.h" |
185 #include "chrome/browser/mac/keystone_glue.h" | 184 #include "chrome/browser/mac/keystone_glue.h" |
186 #endif | 185 #endif |
187 | 186 |
188 #if !defined(DISABLE_NACL) | 187 #if !defined(DISABLE_NACL) |
| 188 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
189 #include "components/nacl/browser/nacl_process_host.h" | 189 #include "components/nacl/browser/nacl_process_host.h" |
190 #endif | 190 #endif |
191 | 191 |
192 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) | 192 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) |
193 #include "printing/printed_document.h" | 193 #include "printing/printed_document.h" |
194 #endif | 194 #endif |
195 | 195 |
196 #if defined(ENABLE_RLZ) | 196 #if defined(ENABLE_RLZ) |
197 #include "chrome/browser/rlz/rlz.h" | 197 #include "chrome/browser/rlz/rlz.h" |
198 #endif | 198 #endif |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
387 g_browser_process->component_updater(); | 387 g_browser_process->component_updater(); |
388 | 388 |
389 // Registration can be before or after cus->Start() so it is ok to post | 389 // Registration can be before or after cus->Start() so it is ok to post |
390 // a task to the UI thread to do registration once you done the necessary | 390 // a task to the UI thread to do registration once you done the necessary |
391 // file IO to know you existing component version. | 391 // file IO to know you existing component version. |
392 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | 392 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |
393 RegisterRecoveryComponent(cus, g_browser_process->local_state()); | 393 RegisterRecoveryComponent(cus, g_browser_process->local_state()); |
394 RegisterPepperFlashComponent(cus); | 394 RegisterPepperFlashComponent(cus); |
395 RegisterSwiftShaderComponent(cus); | 395 RegisterSwiftShaderComponent(cus); |
396 RegisterWidevineCdmComponent(cus); | 396 RegisterWidevineCdmComponent(cus); |
| 397 #if !defined(DISABLE_NACL) |
397 g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus); | 398 g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus); |
398 #endif | 399 #endif |
| 400 #endif |
399 | 401 |
400 if (translate::CldDataSource::ShouldRegisterForComponentUpdates()) { | 402 if (translate::CldDataSource::ShouldRegisterForComponentUpdates()) { |
401 RegisterCldComponent(cus); | 403 RegisterCldComponent(cus); |
402 } | 404 } |
403 | 405 |
404 base::FilePath path; | 406 base::FilePath path; |
405 if (PathService::Get(chrome::DIR_USER_DATA, &path)) { | 407 if (PathService::Get(chrome::DIR_USER_DATA, &path)) { |
406 #if defined(OS_ANDROID) | 408 #if defined(OS_ANDROID) |
407 // The CRLSet component was enabled for some releases. This code attempts to | 409 // The CRLSet component was enabled for some releases. This code attempts to |
408 // delete it from the local disk of those how may have downloaded it. | 410 // delete it from the local disk of those how may have downloaded it. |
(...skipping 1254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1663 chromeos::CrosSettings::Shutdown(); | 1665 chromeos::CrosSettings::Shutdown(); |
1664 #endif | 1666 #endif |
1665 #endif | 1667 #endif |
1666 } | 1668 } |
1667 | 1669 |
1668 // Public members: | 1670 // Public members: |
1669 | 1671 |
1670 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1672 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1671 chrome_extra_parts_.push_back(parts); | 1673 chrome_extra_parts_.push_back(parts); |
1672 } | 1674 } |
OLD | NEW |