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_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 #include "grit/generated_resources.h" | 119 #include "grit/generated_resources.h" |
120 #include "grit/ui_resources.h" | 120 #include "grit/ui_resources.h" |
121 #include "net/base/escape.h" | 121 #include "net/base/escape.h" |
122 #include "net/base/mime_util.h" | 122 #include "net/base/mime_util.h" |
123 #include "net/cookies/canonical_cookie.h" | 123 #include "net/cookies/canonical_cookie.h" |
124 #include "net/cookies/cookie_options.h" | 124 #include "net/cookies/cookie_options.h" |
125 #include "net/ssl/ssl_cert_request_info.h" | 125 #include "net/ssl/ssl_cert_request_info.h" |
126 #include "ppapi/host/ppapi_host.h" | 126 #include "ppapi/host/ppapi_host.h" |
127 #include "ui/base/l10n/l10n_util.h" | 127 #include "ui/base/l10n/l10n_util.h" |
128 #include "ui/base/resource/resource_bundle.h" | 128 #include "ui/base/resource/resource_bundle.h" |
| 129 #include "ui/message_center/message_center_util.h" |
129 #include "webkit/glue/webpreferences.h" | 130 #include "webkit/glue/webpreferences.h" |
130 #include "webkit/plugins/plugin_switches.h" | 131 #include "webkit/plugins/plugin_switches.h" |
131 | 132 |
132 #if defined(OS_WIN) | 133 #if defined(OS_WIN) |
133 #include "chrome/browser/chrome_browser_main_win.h" | 134 #include "chrome/browser/chrome_browser_main_win.h" |
134 #include "sandbox/win/src/sandbox_policy.h" | 135 #include "sandbox/win/src/sandbox_policy.h" |
135 #elif defined(OS_MACOSX) | 136 #elif defined(OS_MACOSX) |
136 #include "chrome/browser/chrome_browser_main_mac.h" | 137 #include "chrome/browser/chrome_browser_main_mac.h" |
137 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" | 138 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" |
138 #elif defined(OS_CHROMEOS) | 139 #elif defined(OS_CHROMEOS) |
(...skipping 14 matching lines...) Expand all Loading... |
153 | 154 |
154 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID) | 155 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID) |
155 #include "base/linux_util.h" | 156 #include "base/linux_util.h" |
156 #include "chrome/browser/crash_handler_host_linux.h" | 157 #include "chrome/browser/crash_handler_host_linux.h" |
157 #endif | 158 #endif |
158 | 159 |
159 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) | 160 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) |
160 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" | 161 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" |
161 #endif | 162 #endif |
162 | 163 |
163 #if defined(ENABLE_MESSAGE_CENTER) | |
164 #include "ui/message_center/message_center_util.h" | |
165 #endif | |
166 | |
167 #if defined(OS_ANDROID) | 164 #if defined(OS_ANDROID) |
168 #include "ui/base/ui_base_paths.h" | 165 #include "ui/base/ui_base_paths.h" |
169 #endif | 166 #endif |
170 | 167 |
171 #if defined(USE_NSS) | 168 #if defined(USE_NSS) |
172 #include "chrome/browser/ui/crypto_module_password_dialog.h" | 169 #include "chrome/browser/ui/crypto_module_password_dialog.h" |
173 #endif | 170 #endif |
174 | 171 |
175 #if !defined(OS_CHROMEOS) | 172 #if !defined(OS_CHROMEOS) |
176 #include "chrome/browser/signin/signin_manager.h" | 173 #include "chrome/browser/signin/signin_manager.h" |
(...skipping 1039 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1216 SigninManager* signin_manager = | 1213 SigninManager* signin_manager = |
1217 SigninManagerFactory::GetForProfile(profile); | 1214 SigninManagerFactory::GetForProfile(profile); |
1218 if (signin_manager && signin_manager->IsSigninProcess(process->GetID())) | 1215 if (signin_manager && signin_manager->IsSigninProcess(process->GetID())) |
1219 command_line->AppendSwitch(switches::kSigninProcess); | 1216 command_line->AppendSwitch(switches::kSigninProcess); |
1220 #endif | 1217 #endif |
1221 } | 1218 } |
1222 | 1219 |
1223 if (content::IsThreadedCompositingEnabled()) | 1220 if (content::IsThreadedCompositingEnabled()) |
1224 command_line->AppendSwitch(switches::kEnableThreadedCompositing); | 1221 command_line->AppendSwitch(switches::kEnableThreadedCompositing); |
1225 | 1222 |
1226 #if defined(ENABLE_MESSAGE_CENTER) | |
1227 if (message_center::IsRichNotificationEnabled()) | 1223 if (message_center::IsRichNotificationEnabled()) |
1228 command_line->AppendSwitch(switches::kDisableHTMLNotifications); | 1224 command_line->AppendSwitch(switches::kDisableHTMLNotifications); |
1229 #endif | |
1230 | 1225 |
1231 // Please keep this in alphabetical order. | 1226 // Please keep this in alphabetical order. |
1232 static const char* const kSwitchNames[] = { | 1227 static const char* const kSwitchNames[] = { |
1233 autofill::switches::kEnableExperimentalFormFilling, | 1228 autofill::switches::kEnableExperimentalFormFilling, |
1234 switches::kAllowHTTPBackgroundPage, | 1229 switches::kAllowHTTPBackgroundPage, |
1235 switches::kAllowLegacyExtensionManifests, | 1230 switches::kAllowLegacyExtensionManifests, |
1236 switches::kAllowScriptingGallery, | 1231 switches::kAllowScriptingGallery, |
1237 switches::kAppsCheckoutURL, | 1232 switches::kAppsCheckoutURL, |
1238 switches::kAppsGalleryURL, | 1233 switches::kAppsGalleryURL, |
1239 switches::kCloudPrintServiceURL, | 1234 switches::kCloudPrintServiceURL, |
(...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2288 #if defined(USE_NSS) | 2283 #if defined(USE_NSS) |
2289 crypto::CryptoModuleBlockingPasswordDelegate* | 2284 crypto::CryptoModuleBlockingPasswordDelegate* |
2290 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2285 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2291 const GURL& url) { | 2286 const GURL& url) { |
2292 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2287 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2293 chrome::kCryptoModulePasswordKeygen, url.host()); | 2288 chrome::kCryptoModulePasswordKeygen, url.host()); |
2294 } | 2289 } |
2295 #endif | 2290 #endif |
2296 | 2291 |
2297 } // namespace chrome | 2292 } // namespace chrome |
OLD | NEW |