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 24 matching lines...) Expand all Loading... | |
35 #include "base/threading/platform_thread.h" | 35 #include "base/threading/platform_thread.h" |
36 #include "base/time/time.h" | 36 #include "base/time/time.h" |
37 #include "base/values.h" | 37 #include "base/values.h" |
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" | |
46 #include "chrome/browser/component_updater/component_updater_service.h" | 45 #include "chrome/browser/component_updater/component_updater_service.h" |
47 #include "chrome/browser/component_updater/flash_component_installer.h" | 46 #include "chrome/browser/component_updater/flash_component_installer.h" |
48 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 47 #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" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
175 #include "ui/base/l10n/l10n_util_win.h" | 174 #include "ui/base/l10n/l10n_util_win.h" |
176 #include "ui/gfx/win/dpi.h" | 175 #include "ui/gfx/win/dpi.h" |
177 #endif // defined(OS_WIN) | 176 #endif // defined(OS_WIN) |
178 | 177 |
179 #if defined(OS_MACOSX) | 178 #if defined(OS_MACOSX) |
180 #include <Security/Security.h> | 179 #include <Security/Security.h> |
181 | 180 |
182 #include "base/mac/scoped_nsautorelease_pool.h" | 181 #include "base/mac/scoped_nsautorelease_pool.h" |
183 #include "chrome/browser/mac/keystone_glue.h" | 182 #include "chrome/browser/mac/keystone_glue.h" |
184 #endif | 183 #endif |
185 | 184 |
Takashi Toyoshima
2014/06/23 08:49:59
Maybe here is a better place to insert #if defined
Andrew Hayden (chromium.org)
2014/06/23 13:20:34
Done.
| |
186 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) | 185 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) |
187 #include "printing/printed_document.h" | 186 #include "printing/printed_document.h" |
188 #endif | 187 #endif |
189 | 188 |
190 #if defined(ENABLE_RLZ) | 189 #if defined(ENABLE_RLZ) |
191 #include "chrome/browser/rlz/rlz.h" | 190 #include "chrome/browser/rlz/rlz.h" |
192 #endif | 191 #endif |
193 | 192 |
194 #if defined(ENABLE_WEBRTC) | 193 #if defined(ENABLE_WEBRTC) |
195 #include "chrome/browser/media/webrtc_log_util.h" | 194 #include "chrome/browser/media/webrtc_log_util.h" |
196 #endif | 195 #endif |
197 | 196 |
198 #if defined(USE_AURA) | 197 #if defined(USE_AURA) |
199 #include "ui/aura/env.h" | 198 #include "ui/aura/env.h" |
200 #endif | 199 #endif |
201 | 200 |
201 #if defined(CLD_DATA_FROM_COMPONENT) | |
202 #include "chrome/browser/component_updater/cld_component_installer.h" | |
203 #endif | |
204 | |
202 using content::BrowserThread; | 205 using content::BrowserThread; |
203 | 206 |
204 namespace { | 207 namespace { |
205 | 208 |
206 // This function provides some ways to test crash and assertion handling | 209 // This function provides some ways to test crash and assertion handling |
207 // behavior of the program. | 210 // behavior of the program. |
208 void HandleTestParameters(const CommandLine& command_line) { | 211 void HandleTestParameters(const CommandLine& command_line) { |
209 // This parameter causes an assertion. | 212 // This parameter causes an assertion. |
210 if (command_line.HasSwitch(switches::kBrowserAssertTest)) { | 213 if (command_line.HasSwitch(switches::kBrowserAssertTest)) { |
211 DCHECK(false); | 214 DCHECK(false); |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
396 // CRLSetFetcher attempts to load a CRL set from either the local disk or | 399 // CRLSetFetcher attempts to load a CRL set from either the local disk or |
397 // network. | 400 // network. |
398 if (!command_line.HasSwitch(switches::kDisableCRLSets)) | 401 if (!command_line.HasSwitch(switches::kDisableCRLSets)) |
399 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); | 402 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); |
400 #elif defined(OS_ANDROID) | 403 #elif defined(OS_ANDROID) |
401 // The CRLSet component was enabled for some releases. This code attempts to | 404 // The CRLSet component was enabled for some releases. This code attempts to |
402 // delete it from the local disk of those how may have downloaded it. | 405 // delete it from the local disk of those how may have downloaded it. |
403 g_browser_process->crl_set_fetcher()->DeleteFromDisk(); | 406 g_browser_process->crl_set_fetcher()->DeleteFromDisk(); |
404 #endif | 407 #endif |
405 | 408 |
406 #if defined(CLD2_DYNAMIC_MODE) && defined(CLD2_IS_COMPONENT) | 409 #if defined(CLD_DATA_FROM_COMPONENT) |
407 RegisterCldComponent(cus); | 410 RegisterCldComponent(cus); |
408 #endif | 411 #endif |
409 | 412 |
410 cus->Start(); | 413 cus->Start(); |
411 } | 414 } |
412 | 415 |
413 #if !defined(OS_ANDROID) | 416 #if !defined(OS_ANDROID) |
414 bool ProcessSingletonNotificationCallback( | 417 bool ProcessSingletonNotificationCallback( |
415 const CommandLine& command_line, | 418 const CommandLine& command_line, |
416 const base::FilePath& current_directory) { | 419 const base::FilePath& current_directory) { |
(...skipping 1232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1649 chromeos::CrosSettings::Shutdown(); | 1652 chromeos::CrosSettings::Shutdown(); |
1650 #endif | 1653 #endif |
1651 #endif | 1654 #endif |
1652 } | 1655 } |
1653 | 1656 |
1654 // Public members: | 1657 // Public members: |
1655 | 1658 |
1656 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1659 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1657 chrome_extra_parts_.push_back(parts); | 1660 chrome_extra_parts_.push_back(parts); |
1658 } | 1661 } |
OLD | NEW |