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/app/chrome_main_delegate.h" | 5 #include "chrome/app/chrome_main_delegate.h" |
6 | 6 |
7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/cpu.h" | 9 #include "base/cpu.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
11 #include "base/i18n/rtl.h" | 11 #include "base/i18n/rtl.h" |
12 #include "base/lazy_instance.h" | 12 #include "base/lazy_instance.h" |
13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
14 #include "base/metrics/statistics_recorder.h" | 14 #include "base/metrics/statistics_recorder.h" |
15 #include "base/metrics/stats_counters.h" | 15 #include "base/metrics/stats_counters.h" |
16 #include "base/path_service.h" | 16 #include "base/path_service.h" |
17 #include "base/process/memory.h" | 17 #include "base/process/memory.h" |
18 #include "base/process/process_handle.h" | 18 #include "base/process/process_handle.h" |
19 #include "base/strings/string_util.h" | 19 #include "base/strings/string_util.h" |
20 #include "build/build_config.h" | 20 #include "build/build_config.h" |
21 #include "chrome/browser/chrome_content_browser_client.h" | 21 #include "chrome/browser/chrome_content_browser_client.h" |
22 #include "chrome/browser/defaults.h" | 22 #include "chrome/browser/defaults.h" |
23 #include "chrome/common/chrome_constants.h" | 23 #include "chrome/common/chrome_constants.h" |
24 #include "chrome/common/chrome_content_client.h" | 24 #include "chrome/common/chrome_content_client.h" |
25 #include "chrome/common/chrome_paths.h" | 25 #include "chrome/common/chrome_paths.h" |
26 #include "chrome/common/chrome_paths_internal.h" | 26 #include "chrome/common/chrome_paths_internal.h" |
27 #include "chrome/common/chrome_switches.h" | 27 #include "chrome/common/chrome_switches.h" |
28 #include "chrome/common/chrome_version_info.h" | 28 #include "chrome/common/chrome_version_info.h" |
| 29 #include "chrome/common/content_settings_initializer.h" |
29 #include "chrome/common/crash_keys.h" | 30 #include "chrome/common/crash_keys.h" |
30 #include "chrome/common/logging_chrome.h" | 31 #include "chrome/common/logging_chrome.h" |
31 #include "chrome/common/profiling.h" | 32 #include "chrome/common/profiling.h" |
32 #include "chrome/common/switch_utils.h" | 33 #include "chrome/common/switch_utils.h" |
33 #include "chrome/common/url_constants.h" | 34 #include "chrome/common/url_constants.h" |
34 #include "chrome/plugin/chrome_content_plugin_client.h" | 35 #include "chrome/plugin/chrome_content_plugin_client.h" |
35 #include "chrome/renderer/chrome_content_renderer_client.h" | 36 #include "chrome/renderer/chrome_content_renderer_client.h" |
36 #include "chrome/utility/chrome_content_utility_client.h" | 37 #include "chrome/utility/chrome_content_utility_client.h" |
37 #include "components/component_updater/component_updater_paths.h" | 38 #include "components/component_updater/component_updater_paths.h" |
38 #include "components/startup_metric_utils/startup_metric_utils.h" | 39 #include "components/startup_metric_utils/startup_metric_utils.h" |
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
419 #endif | 420 #endif |
420 | 421 |
421 chrome::RegisterPathProvider(); | 422 chrome::RegisterPathProvider(); |
422 #if defined(OS_CHROMEOS) | 423 #if defined(OS_CHROMEOS) |
423 chromeos::RegisterPathProvider(); | 424 chromeos::RegisterPathProvider(); |
424 #endif | 425 #endif |
425 #if !defined(DISABLE_NACL) && defined(OS_LINUX) | 426 #if !defined(DISABLE_NACL) && defined(OS_LINUX) |
426 nacl::RegisterPathProvider(); | 427 nacl::RegisterPathProvider(); |
427 #endif | 428 #endif |
428 | 429 |
| 430 InitContentSettingsComponent(); |
| 431 |
429 // No support for ANDROID yet as DiagnosticsController needs wchar support. | 432 // No support for ANDROID yet as DiagnosticsController needs wchar support. |
430 // TODO(gspencer): That's not true anymore, or at least there are no w-string | 433 // TODO(gspencer): That's not true anymore, or at least there are no w-string |
431 // references anymore. Not sure if that means this can be enabled on Android or | 434 // references anymore. Not sure if that means this can be enabled on Android or |
432 // not though. As there is no easily accessible command line on Android, I'm | 435 // not though. As there is no easily accessible command line on Android, I'm |
433 // not sure this is a big deal. | 436 // not sure this is a big deal. |
434 #if !defined(OS_ANDROID) && !defined(CHROME_MULTIPLE_DLL_CHILD) | 437 #if !defined(OS_ANDROID) && !defined(CHROME_MULTIPLE_DLL_CHILD) |
435 // If we are in diagnostics mode this is the end of the line: after the | 438 // If we are in diagnostics mode this is the end of the line: after the |
436 // diagnostics are run the process will invariably exit. | 439 // diagnostics are run the process will invariably exit. |
437 if (command_line.HasSwitch(switches::kDiagnostics)) { | 440 if (command_line.HasSwitch(switches::kDiagnostics)) { |
438 diagnostics::DiagnosticsWriter::FormatType format = | 441 diagnostics::DiagnosticsWriter::FormatType format = |
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
922 } | 925 } |
923 | 926 |
924 content::ContentUtilityClient* | 927 content::ContentUtilityClient* |
925 ChromeMainDelegate::CreateContentUtilityClient() { | 928 ChromeMainDelegate::CreateContentUtilityClient() { |
926 #if defined(CHROME_MULTIPLE_DLL_BROWSER) | 929 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
927 return NULL; | 930 return NULL; |
928 #else | 931 #else |
929 return g_chrome_content_utility_client.Pointer(); | 932 return g_chrome_content_utility_client.Pointer(); |
930 #endif | 933 #endif |
931 } | 934 } |
OLD | NEW |