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" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 #if defined(OS_LINUX) | 105 #if defined(OS_LINUX) |
106 #include "base/environment.h" | 106 #include "base/environment.h" |
107 #endif | 107 #endif |
108 | 108 |
109 #if defined(OS_MACOSX) || defined(OS_WIN) | 109 #if defined(OS_MACOSX) || defined(OS_WIN) |
110 #include "chrome/browser/policy/policy_path_parser.h" | 110 #include "chrome/browser/policy/policy_path_parser.h" |
111 #endif | 111 #endif |
112 | 112 |
113 #if !defined(DISABLE_NACL) | 113 #if !defined(DISABLE_NACL) |
114 #include "components/nacl/common/nacl_switches.h" | 114 #include "components/nacl/common/nacl_switches.h" |
115 #include "ppapi/native_client/src/trusted/plugin/ppapi_entrypoints.h" | 115 #include "components/nacl/renderer/plugin/ppapi_entrypoints.h" |
116 #endif | 116 #endif |
117 | 117 |
118 #if defined(ENABLE_REMOTING) | 118 #if defined(ENABLE_REMOTING) |
119 #include "remoting/client/plugin/pepper_entrypoints.h" | 119 #include "remoting/client/plugin/pepper_entrypoints.h" |
120 #endif | 120 #endif |
121 | 121 |
122 #if !defined(CHROME_MULTIPLE_DLL_CHILD) | 122 #if !defined(CHROME_MULTIPLE_DLL_CHILD) |
123 base::LazyInstance<chrome::ChromeContentBrowserClient> | 123 base::LazyInstance<chrome::ChromeContentBrowserClient> |
124 g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER; | 124 g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER; |
125 #endif | 125 #endif |
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
963 } | 963 } |
964 | 964 |
965 content::ContentUtilityClient* | 965 content::ContentUtilityClient* |
966 ChromeMainDelegate::CreateContentUtilityClient() { | 966 ChromeMainDelegate::CreateContentUtilityClient() { |
967 #if defined(CHROME_MULTIPLE_DLL_BROWSER) | 967 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
968 return NULL; | 968 return NULL; |
969 #else | 969 #else |
970 return g_chrome_content_utility_client.Pointer(); | 970 return g_chrome_content_utility_client.Pointer(); |
971 #endif | 971 #endif |
972 } | 972 } |
OLD | NEW |