Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 2 Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 #endif 146 #endif
147 147
148 using content::AccessTokenStore; 148 using content::AccessTokenStore;
149 using content::BrowserThread; 149 using content::BrowserThread;
150 using content::BrowserURLHandler; 150 using content::BrowserURLHandler;
151 using content::ChildProcessSecurityPolicy; 151 using content::ChildProcessSecurityPolicy;
152 using content::QuotaPermissionContext; 152 using content::QuotaPermissionContext;
153 using content::RenderViewHost; 153 using content::RenderViewHost;
154 using content::SiteInstance; 154 using content::SiteInstance;
155 using content::WebContents; 155 using content::WebContents;
156 using extensions::Extension;
156 using webkit_glue::WebPreferences; 157 using webkit_glue::WebPreferences;
157 158
158 namespace { 159 namespace {
159 160
160 const char* kPredefinedAllowedSocketOrigins[] = { 161 const char* kPredefinedAllowedSocketOrigins[] = {
161 "okddffdblfhhnmhodogpojmfkjmhinfp", // Test SSH Client 162 "okddffdblfhhnmhodogpojmfkjmhinfp", // Test SSH Client
162 "pnhechapfaindjhompbnflcldabbghjo", // HTerm App (SSH Client) 163 "pnhechapfaindjhompbnflcldabbghjo", // HTerm App (SSH Client)
163 "bglhmjfplikpjnfoegeomebmfnkjomhe", // see crbug.com/122126 164 "bglhmjfplikpjnfoegeomebmfnkjomhe", // see crbug.com/122126
164 "gbchcmhmhahfdphkhkmpfmihenigjmpp", // Chrome Remote Desktop 165 "gbchcmhmhahfdphkhkmpfmihenigjmpp", // Chrome Remote Desktop
165 "kgngmbheleoaphbjbaiobfdepmghbfah", // Pre-release Chrome Remote Desktop 166 "kgngmbheleoaphbjbaiobfdepmghbfah", // Pre-release Chrome Remote Desktop
(...skipping 1463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1629 #if defined(USE_NSS) 1630 #if defined(USE_NSS)
1630 crypto::CryptoModuleBlockingPasswordDelegate* 1631 crypto::CryptoModuleBlockingPasswordDelegate*
1631 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1632 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1632 const GURL& url) { 1633 const GURL& url) {
1633 return browser::NewCryptoModuleBlockingDialogDelegate( 1634 return browser::NewCryptoModuleBlockingDialogDelegate(
1634 browser::kCryptoModulePasswordKeygen, url.host()); 1635 browser::kCryptoModulePasswordKeygen, url.host());
1635 } 1636 }
1636 #endif 1637 #endif
1637 1638
1638 } // namespace chrome 1639 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698