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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 #include "chrome/browser/user_style_sheet_watcher.h" | 65 #include "chrome/browser/user_style_sheet_watcher.h" |
66 #include "chrome/common/child_process_logging.h" | 66 #include "chrome/common/child_process_logging.h" |
67 #include "chrome/common/chrome_constants.h" | 67 #include "chrome/common/chrome_constants.h" |
68 #include "chrome/common/chrome_switches.h" | 68 #include "chrome/common/chrome_switches.h" |
69 #include "chrome/common/extensions/extension.h" | 69 #include "chrome/common/extensions/extension.h" |
70 #include "chrome/common/extensions/extension_set.h" | 70 #include "chrome/common/extensions/extension_set.h" |
71 #include "chrome/common/logging_chrome.h" | 71 #include "chrome/common/logging_chrome.h" |
72 #include "chrome/common/pref_names.h" | 72 #include "chrome/common/pref_names.h" |
73 #include "chrome/common/render_messages.h" | 73 #include "chrome/common/render_messages.h" |
74 #include "chrome/common/url_constants.h" | 74 #include "chrome/common/url_constants.h" |
75 #include "content/browser/browser_url_handler.h" | |
76 #include "content/public/browser/browser_main_parts.h" | 75 #include "content/public/browser/browser_main_parts.h" |
| 76 #include "content/public/browser/browser_url_handler.h" |
77 #include "content/public/browser/child_process_security_policy.h" | 77 #include "content/public/browser/child_process_security_policy.h" |
78 #include "content/public/browser/render_process_host.h" | 78 #include "content/public/browser/render_process_host.h" |
79 #include "content/public/browser/render_view_host.h" | 79 #include "content/public/browser/render_view_host.h" |
80 #include "content/public/browser/resource_context.h" | 80 #include "content/public/browser/resource_context.h" |
81 #include "content/public/browser/site_instance.h" | 81 #include "content/public/browser/site_instance.h" |
82 #include "content/public/browser/web_contents.h" | 82 #include "content/public/browser/web_contents.h" |
83 #include "content/public/browser/web_contents_view.h" | 83 #include "content/public/browser/web_contents_view.h" |
84 #include "grit/generated_resources.h" | 84 #include "grit/generated_resources.h" |
85 #include "grit/ui_resources.h" | 85 #include "grit/ui_resources.h" |
86 #include "net/base/cookie_monster.h" | 86 #include "net/base/cookie_monster.h" |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 #elif defined(OS_ANDROID) | 134 #elif defined(OS_ANDROID) |
135 #include "content/browser/tab_contents/web_contents_view_android.h" | 135 #include "content/browser/tab_contents/web_contents_view_android.h" |
136 #endif | 136 #endif |
137 | 137 |
138 #if defined(USE_NSS) | 138 #if defined(USE_NSS) |
139 #include "chrome/browser/ui/crypto_module_password_dialog.h" | 139 #include "chrome/browser/ui/crypto_module_password_dialog.h" |
140 #endif | 140 #endif |
141 | 141 |
142 using content::AccessTokenStore; | 142 using content::AccessTokenStore; |
143 using content::BrowserThread; | 143 using content::BrowserThread; |
| 144 using content::BrowserURLHandler; |
144 using content::ChildProcessSecurityPolicy; | 145 using content::ChildProcessSecurityPolicy; |
145 using content::QuotaPermissionContext; | 146 using content::QuotaPermissionContext; |
146 using content::RenderViewHost; | 147 using content::RenderViewHost; |
147 using content::SiteInstance; | 148 using content::SiteInstance; |
148 using content::WebContents; | 149 using content::WebContents; |
149 | 150 |
150 namespace { | 151 namespace { |
151 | 152 |
152 const char* kPredefinedAllowedSocketOrigins[] = { | 153 const char* kPredefinedAllowedSocketOrigins[] = { |
153 "okddffdblfhhnmhodogpojmfkjmhinfp", // Test SSH Client | 154 "okddffdblfhhnmhodogpojmfkjmhinfp", // Test SSH Client |
(...skipping 1454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1608 #if defined(USE_NSS) | 1609 #if defined(USE_NSS) |
1609 crypto::CryptoModuleBlockingPasswordDelegate* | 1610 crypto::CryptoModuleBlockingPasswordDelegate* |
1610 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1611 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
1611 const GURL& url) { | 1612 const GURL& url) { |
1612 return browser::NewCryptoModuleBlockingDialogDelegate( | 1613 return browser::NewCryptoModuleBlockingDialogDelegate( |
1613 browser::kCryptoModulePasswordKeygen, url.host()); | 1614 browser::kCryptoModulePasswordKeygen, url.host()); |
1614 } | 1615 } |
1615 #endif | 1616 #endif |
1616 | 1617 |
1617 } // namespace chrome | 1618 } // namespace chrome |
OLD | NEW |