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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 #include "chrome/common/extensions/permissions/socket_permission.h" | 102 #include "chrome/common/extensions/permissions/socket_permission.h" |
103 #include "chrome/common/extensions/web_accessible_resources_handler.h" | 103 #include "chrome/common/extensions/web_accessible_resources_handler.h" |
104 #include "chrome/common/logging_chrome.h" | 104 #include "chrome/common/logging_chrome.h" |
105 #include "chrome/common/pepper_permission_util.h" | 105 #include "chrome/common/pepper_permission_util.h" |
106 #include "chrome/common/pref_names.h" | 106 #include "chrome/common/pref_names.h" |
107 #include "chrome/common/render_messages.h" | 107 #include "chrome/common/render_messages.h" |
108 #include "chrome/common/url_constants.h" | 108 #include "chrome/common/url_constants.h" |
109 #include "chrome/installer/util/google_update_settings.h" | 109 #include "chrome/installer/util/google_update_settings.h" |
110 #include "chromeos/chromeos_constants.h" | 110 #include "chromeos/chromeos_constants.h" |
111 #include "components/nacl/common/nacl_process_type.h" | 111 #include "components/nacl/common/nacl_process_type.h" |
| 112 #include "components/translate/common/translate_switches.h" |
112 #include "components/user_prefs/pref_registry_syncable.h" | 113 #include "components/user_prefs/pref_registry_syncable.h" |
113 #include "content/public/browser/browser_child_process_host.h" | 114 #include "content/public/browser/browser_child_process_host.h" |
114 #include "content/public/browser/browser_main_parts.h" | 115 #include "content/public/browser/browser_main_parts.h" |
115 #include "content/public/browser/browser_ppapi_host.h" | 116 #include "content/public/browser/browser_ppapi_host.h" |
116 #include "content/public/browser/browser_thread.h" | 117 #include "content/public/browser/browser_thread.h" |
117 #include "content/public/browser/browser_url_handler.h" | 118 #include "content/public/browser/browser_url_handler.h" |
118 #include "content/public/browser/child_process_data.h" | 119 #include "content/public/browser/child_process_data.h" |
119 #include "content/public/browser/child_process_security_policy.h" | 120 #include "content/public/browser/child_process_security_policy.h" |
120 #include "content/public/browser/render_process_host.h" | 121 #include "content/public/browser/render_process_host.h" |
121 #include "content/public/browser/render_view_host.h" | 122 #include "content/public/browser/render_view_host.h" |
(...skipping 1327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1449 switches::kPpapiFlashArgs, | 1450 switches::kPpapiFlashArgs, |
1450 switches::kPpapiFlashInProcess, | 1451 switches::kPpapiFlashInProcess, |
1451 switches::kPpapiFlashPath, | 1452 switches::kPpapiFlashPath, |
1452 switches::kPpapiFlashVersion, | 1453 switches::kPpapiFlashVersion, |
1453 switches::kProfilingAtStart, | 1454 switches::kProfilingAtStart, |
1454 switches::kProfilingFile, | 1455 switches::kProfilingFile, |
1455 switches::kProfilingFlush, | 1456 switches::kProfilingFlush, |
1456 switches::kRecordMode, | 1457 switches::kRecordMode, |
1457 switches::kSilentDumpOnDCHECK, | 1458 switches::kSilentDumpOnDCHECK, |
1458 switches::kSpdyProxyAuthOrigin, | 1459 switches::kSpdyProxyAuthOrigin, |
1459 switches::kTranslateSecurityOrigin, | |
1460 switches::kWhitelistedExtensionID, | 1460 switches::kWhitelistedExtensionID, |
| 1461 translate::switches::kTranslateSecurityOrigin, |
1461 }; | 1462 }; |
1462 | 1463 |
1463 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1464 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
1464 arraysize(kSwitchNames)); | 1465 arraysize(kSwitchNames)); |
1465 } else if (process_type == switches::kUtilityProcess) { | 1466 } else if (process_type == switches::kUtilityProcess) { |
1466 static const char* const kSwitchNames[] = { | 1467 static const char* const kSwitchNames[] = { |
1467 extensions::switches::kEnableExperimentalExtensionApis, | 1468 extensions::switches::kEnableExperimentalExtensionApis, |
1468 extensions::switches::kExtensionsOnChromeURLs, | 1469 extensions::switches::kExtensionsOnChromeURLs, |
1469 switches::kAllowHTTPBackgroundPage, | 1470 switches::kAllowHTTPBackgroundPage, |
1470 switches::kWhitelistedExtensionID, | 1471 switches::kWhitelistedExtensionID, |
(...skipping 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2545 #if defined(USE_NSS) | 2546 #if defined(USE_NSS) |
2546 crypto::CryptoModuleBlockingPasswordDelegate* | 2547 crypto::CryptoModuleBlockingPasswordDelegate* |
2547 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2548 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2548 const GURL& url) { | 2549 const GURL& url) { |
2549 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2550 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2550 chrome::kCryptoModulePasswordKeygen, url.host()); | 2551 chrome::kCryptoModulePasswordKeygen, url.host()); |
2551 } | 2552 } |
2552 #endif | 2553 #endif |
2553 | 2554 |
2554 } // namespace chrome | 2555 } // namespace chrome |
OLD | NEW |