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

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

Issue 9566035: Move QuotaPermissionContext to content/public/browser and put it in the content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 years, 9 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 | Annotate | Revision Log
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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 #include "content/browser/tab_contents/web_contents_view_android.h" 133 #include "content/browser/tab_contents/web_contents_view_android.h"
134 #endif 134 #endif
135 135
136 #if defined(USE_NSS) 136 #if defined(USE_NSS)
137 #include "chrome/browser/ui/crypto_module_password_dialog.h" 137 #include "chrome/browser/ui/crypto_module_password_dialog.h"
138 #endif 138 #endif
139 139
140 using content::AccessTokenStore; 140 using content::AccessTokenStore;
141 using content::BrowserThread; 141 using content::BrowserThread;
142 using content::ChildProcessSecurityPolicy; 142 using content::ChildProcessSecurityPolicy;
143 using content::QuotaPermissionContext;
143 using content::SiteInstance; 144 using content::SiteInstance;
144 using content::WebContents; 145 using content::WebContents;
145 146
146 namespace { 147 namespace {
147 148
148 const char* kPredefinedAllowedSocketOrigins[] = { 149 const char* kPredefinedAllowedSocketOrigins[] = {
149 "okddffdblfhhnmhodogpojmfkjmhinfp", // Test SSH Client 150 "okddffdblfhhnmhodogpojmfkjmhinfp", // Test SSH Client
150 "pnhechapfaindjhompbnflcldabbghjo" // HTerm App (SSH Client) 151 "pnhechapfaindjhompbnflcldabbghjo" // HTerm App (SSH Client)
151 }; 152 };
152 153
(...skipping 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after
1532 #if defined(USE_NSS) 1533 #if defined(USE_NSS)
1533 crypto::CryptoModuleBlockingPasswordDelegate* 1534 crypto::CryptoModuleBlockingPasswordDelegate*
1534 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1535 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1535 const GURL& url) { 1536 const GURL& url) {
1536 return browser::NewCryptoModuleBlockingDialogDelegate( 1537 return browser::NewCryptoModuleBlockingDialogDelegate(
1537 browser::kCryptoModulePasswordKeygen, url.host()); 1538 browser::kCryptoModulePasswordKeygen, url.host());
1538 } 1539 }
1539 #endif 1540 #endif
1540 1541
1541 } // namespace chrome 1542 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chrome_quota_permission_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698