| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 #include "content/public/browser/child_process_security_policy.h" | 103 #include "content/public/browser/child_process_security_policy.h" |
| 104 #include "content/public/browser/compositor_util.h" | 104 #include "content/public/browser/compositor_util.h" |
| 105 #include "content/public/browser/render_process_host.h" | 105 #include "content/public/browser/render_process_host.h" |
| 106 #include "content/public/browser/render_view_host.h" | 106 #include "content/public/browser/render_view_host.h" |
| 107 #include "content/public/browser/resource_context.h" | 107 #include "content/public/browser/resource_context.h" |
| 108 #include "content/public/browser/site_instance.h" | 108 #include "content/public/browser/site_instance.h" |
| 109 #include "content/public/browser/web_contents.h" | 109 #include "content/public/browser/web_contents.h" |
| 110 #include "content/public/browser/web_contents_view.h" | 110 #include "content/public/browser/web_contents_view.h" |
| 111 #include "content/public/common/child_process_host.h" | 111 #include "content/public/common/child_process_host.h" |
| 112 #include "content/public/common/content_descriptors.h" | 112 #include "content/public/common/content_descriptors.h" |
| 113 #include "content/public/common/content_switches.h" |
| 113 #include "extensions/common/constants.h" | 114 #include "extensions/common/constants.h" |
| 114 #include "grit/generated_resources.h" | 115 #include "grit/generated_resources.h" |
| 115 #include "grit/ui_resources.h" | 116 #include "grit/ui_resources.h" |
| 116 #include "net/base/escape.h" | 117 #include "net/base/escape.h" |
| 117 #include "net/base/mime_util.h" | 118 #include "net/base/mime_util.h" |
| 118 #include "net/cookies/canonical_cookie.h" | 119 #include "net/cookies/canonical_cookie.h" |
| 119 #include "net/cookies/cookie_options.h" | 120 #include "net/cookies/cookie_options.h" |
| 120 #include "net/ssl/ssl_cert_request_info.h" | 121 #include "net/ssl/ssl_cert_request_info.h" |
| 121 #include "ppapi/host/ppapi_host.h" | 122 #include "ppapi/host/ppapi_host.h" |
| 122 #include "ui/base/l10n/l10n_util.h" | 123 #include "ui/base/l10n/l10n_util.h" |
| (...skipping 1020 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1143 SigninManagerFactory::GetForProfile(profile); | 1144 SigninManagerFactory::GetForProfile(profile); |
| 1144 if (signin_manager && signin_manager->IsSigninProcess(process->GetID())) | 1145 if (signin_manager && signin_manager->IsSigninProcess(process->GetID())) |
| 1145 command_line->AppendSwitch(switches::kSigninProcess); | 1146 command_line->AppendSwitch(switches::kSigninProcess); |
| 1146 } | 1147 } |
| 1147 | 1148 |
| 1148 if (content::IsThreadedCompositingEnabled()) | 1149 if (content::IsThreadedCompositingEnabled()) |
| 1149 command_line->AppendSwitch(switches::kEnableThreadedCompositing); | 1150 command_line->AppendSwitch(switches::kEnableThreadedCompositing); |
| 1150 | 1151 |
| 1151 // Please keep this in alphabetical order. | 1152 // Please keep this in alphabetical order. |
| 1152 static const char* const kSwitchNames[] = { | 1153 static const char* const kSwitchNames[] = { |
| 1154 switches::kAllowGetOSFileHandleAPI, |
| 1153 switches::kAllowHTTPBackgroundPage, | 1155 switches::kAllowHTTPBackgroundPage, |
| 1154 switches::kAllowLegacyExtensionManifests, | 1156 switches::kAllowLegacyExtensionManifests, |
| 1155 switches::kAllowScriptingGallery, | 1157 switches::kAllowScriptingGallery, |
| 1156 switches::kAppsCheckoutURL, | 1158 switches::kAppsCheckoutURL, |
| 1157 switches::kAppsGalleryURL, | 1159 switches::kAppsGalleryURL, |
| 1158 switches::kCloudPrintServiceURL, | 1160 switches::kCloudPrintServiceURL, |
| 1159 switches::kDebugPrint, | 1161 switches::kDebugPrint, |
| 1160 switches::kDisableBundledPpapiFlash, | 1162 switches::kDisableBundledPpapiFlash, |
| 1161 switches::kDisableExtensionsResourceWhitelist, | 1163 switches::kDisableExtensionsResourceWhitelist, |
| 1162 switches::kDisableScriptedPrintThrottling, | 1164 switches::kDisableScriptedPrintThrottling, |
| (...skipping 1016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2179 io_thread_application_locale_ = locale; | 2181 io_thread_application_locale_ = locale; |
| 2180 } | 2182 } |
| 2181 | 2183 |
| 2182 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( | 2184 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( |
| 2183 const std::string& locale) { | 2185 const std::string& locale) { |
| 2184 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 2186 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 2185 io_thread_application_locale_ = locale; | 2187 io_thread_application_locale_ = locale; |
| 2186 } | 2188 } |
| 2187 | 2189 |
| 2188 } // namespace chrome | 2190 } // namespace chrome |
| OLD | NEW |