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/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/metrics/stats_counters.h" | 10 #include "base/metrics/stats_counters.h" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "base/process_util.h" | 12 #include "base/process_util.h" |
13 #include "base/stringprintf.h" | 13 #include "base/stringprintf.h" |
14 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
15 #include "build/build_config.h" | 15 #include "build/build_config.h" |
16 #include "chrome/browser/chrome_content_browser_client.h" | 16 #include "chrome/browser/chrome_content_browser_client.h" |
17 #include "chrome/browser/defaults.h" | 17 #include "chrome/browser/defaults.h" |
18 #include "chrome/browser/diagnostics/diagnostics_main.h" | 18 #include "chrome/browser/diagnostics/diagnostics_main.h" |
19 #include "chrome/browser/policy/policy_path_parser.h" | 19 #include "chrome/browser/policy/policy_path_parser.h" |
20 #include "chrome/common/chrome_constants.h" | 20 #include "chrome/common/chrome_constants.h" |
21 #include "chrome/common/chrome_content_client.h" | 21 #include "chrome/common/chrome_content_client.h" |
22 #include "chrome/common/chrome_paths.h" | 22 #include "chrome/common/chrome_paths.h" |
23 #include "chrome/common/chrome_paths_internal.h" | 23 #include "chrome/common/chrome_paths_internal.h" |
24 #include "chrome/common/chrome_switches.h" | 24 #include "chrome/common/chrome_switches.h" |
25 #include "chrome/common/chrome_version_info.h" | 25 #include "chrome/common/chrome_version_info.h" |
26 #include "chrome/common/logging_chrome.h" | 26 #include "chrome/common/logging_chrome.h" |
27 #include "chrome/common/profiling.h" | 27 #include "chrome/common/profiling.h" |
28 #include "chrome/common/startup_metric_utils.h" | 28 #include "chrome/common/startup_metric_utils.h" |
29 #include "chrome/common/url_constants.h" | 29 #include "chrome/common/url_constants.h" |
| 30 #include "chrome/nacl/nacl_switches.h" |
30 #include "chrome/plugin/chrome_content_plugin_client.h" | 31 #include "chrome/plugin/chrome_content_plugin_client.h" |
31 #include "chrome/renderer/chrome_content_renderer_client.h" | 32 #include "chrome/renderer/chrome_content_renderer_client.h" |
32 #include "chrome/utility/chrome_content_utility_client.h" | 33 #include "chrome/utility/chrome_content_utility_client.h" |
33 #include "content/public/common/content_client.h" | 34 #include "content/public/common/content_client.h" |
34 #include "content/public/common/content_paths.h" | 35 #include "content/public/common/content_paths.h" |
35 #include "ui/base/ui_base_switches.h" | 36 #include "ui/base/ui_base_switches.h" |
36 | 37 |
37 #if defined(OS_WIN) | 38 #if defined(OS_WIN) |
38 #include <algorithm> | 39 #include <algorithm> |
39 #include <atlbase.h> | 40 #include <atlbase.h> |
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
713 | 714 |
714 content::ContentRendererClient* | 715 content::ContentRendererClient* |
715 ChromeMainDelegate::CreateContentRendererClient() { | 716 ChromeMainDelegate::CreateContentRendererClient() { |
716 return &g_chrome_content_renderer_client.Get(); | 717 return &g_chrome_content_renderer_client.Get(); |
717 } | 718 } |
718 | 719 |
719 content::ContentUtilityClient* | 720 content::ContentUtilityClient* |
720 ChromeMainDelegate::CreateContentUtilityClient() { | 721 ChromeMainDelegate::CreateContentUtilityClient() { |
721 return &g_chrome_content_utility_client.Get(); | 722 return &g_chrome_content_utility_client.Get(); |
722 } | 723 } |
OLD | NEW |