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 <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 #include "chrome/common/child_process_logging.h" | 58 #include "chrome/common/child_process_logging.h" |
59 #include "chrome/common/chrome_constants.h" | 59 #include "chrome/common/chrome_constants.h" |
60 #include "chrome/common/chrome_switches.h" | 60 #include "chrome/common/chrome_switches.h" |
61 #include "chrome/common/extensions/extension.h" | 61 #include "chrome/common/extensions/extension.h" |
62 #include "chrome/common/extensions/extension_set.h" | 62 #include "chrome/common/extensions/extension_set.h" |
63 #include "chrome/common/logging_chrome.h" | 63 #include "chrome/common/logging_chrome.h" |
64 #include "chrome/common/pref_names.h" | 64 #include "chrome/common/pref_names.h" |
65 #include "chrome/common/render_messages.h" | 65 #include "chrome/common/render_messages.h" |
66 #include "chrome/common/url_constants.h" | 66 #include "chrome/common/url_constants.h" |
67 #include "content/browser/browser_url_handler.h" | 67 #include "content/browser/browser_url_handler.h" |
68 #include "content/browser/child_process_security_policy.h" | |
69 #include "content/browser/renderer_host/render_view_host.h" | 68 #include "content/browser/renderer_host/render_view_host.h" |
70 #include "content/browser/resource_context.h" | 69 #include "content/browser/resource_context.h" |
71 #include "content/browser/ssl/ssl_cert_error_handler.h" | 70 #include "content/browser/ssl/ssl_cert_error_handler.h" |
72 #include "content/browser/ssl/ssl_client_auth_handler.h" | 71 #include "content/browser/ssl/ssl_client_auth_handler.h" |
73 #include "content/public/browser/browser_main_parts.h" | 72 #include "content/public/browser/browser_main_parts.h" |
| 73 #include "content/public/browser/child_process_security_policy.h" |
74 #include "content/public/browser/render_process_host.h" | 74 #include "content/public/browser/render_process_host.h" |
75 #include "content/public/browser/site_instance.h" | 75 #include "content/public/browser/site_instance.h" |
76 #include "content/public/browser/web_contents.h" | 76 #include "content/public/browser/web_contents.h" |
77 #include "content/public/browser/web_contents_view.h" | 77 #include "content/public/browser/web_contents_view.h" |
78 #include "grit/generated_resources.h" | 78 #include "grit/generated_resources.h" |
79 #include "grit/ui_resources.h" | 79 #include "grit/ui_resources.h" |
80 #include "net/base/cookie_monster.h" | 80 #include "net/base/cookie_monster.h" |
81 #include "net/base/cookie_options.h" | 81 #include "net/base/cookie_options.h" |
82 #include "ui/base/l10n/l10n_util.h" | 82 #include "ui/base/l10n/l10n_util.h" |
83 #include "ui/base/resource/resource_bundle.h" | 83 #include "ui/base/resource/resource_bundle.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 #include "chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.h" | 122 #include "chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.h" |
123 #include "content/browser/tab_contents/web_contents_view_mac.h" | 123 #include "content/browser/tab_contents/web_contents_view_mac.h" |
124 #endif | 124 #endif |
125 | 125 |
126 #if defined(USE_NSS) | 126 #if defined(USE_NSS) |
127 #include "chrome/browser/ui/crypto_module_password_dialog.h" | 127 #include "chrome/browser/ui/crypto_module_password_dialog.h" |
128 #endif | 128 #endif |
129 | 129 |
130 using content::AccessTokenStore; | 130 using content::AccessTokenStore; |
131 using content::BrowserThread; | 131 using content::BrowserThread; |
| 132 using content::ChildProcessSecurityPolicy; |
132 using content::SiteInstance; | 133 using content::SiteInstance; |
133 using content::WebContents; | 134 using content::WebContents; |
134 | 135 |
135 namespace { | 136 namespace { |
136 | 137 |
137 // Handles rewriting Web UI URLs. | 138 // Handles rewriting Web UI URLs. |
138 bool HandleWebUI(GURL* url, content::BrowserContext* browser_context) { | 139 bool HandleWebUI(GURL* url, content::BrowserContext* browser_context) { |
139 if (!ChromeWebUIControllerFactory::GetInstance()->UseWebUIForURL( | 140 if (!ChromeWebUIControllerFactory::GetInstance()->UseWebUIForURL( |
140 browser_context, *url)) | 141 browser_context, *url)) |
141 return false; | 142 return false; |
(...skipping 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1332 #if defined(USE_NSS) | 1333 #if defined(USE_NSS) |
1333 crypto::CryptoModuleBlockingPasswordDelegate* | 1334 crypto::CryptoModuleBlockingPasswordDelegate* |
1334 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1335 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
1335 const GURL& url) { | 1336 const GURL& url) { |
1336 return browser::NewCryptoModuleBlockingDialogDelegate( | 1337 return browser::NewCryptoModuleBlockingDialogDelegate( |
1337 browser::kCryptoModulePasswordKeygen, url.host()); | 1338 browser::kCryptoModulePasswordKeygen, url.host()); |
1338 } | 1339 } |
1339 #endif | 1340 #endif |
1340 | 1341 |
1341 } // namespace chrome | 1342 } // namespace chrome |
OLD | NEW |