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

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

Issue 10207007: Whitelist chromoting to access NaCl Socket API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 using content::QuotaPermissionContext; 150 using content::QuotaPermissionContext;
151 using content::RenderViewHost; 151 using content::RenderViewHost;
152 using content::SiteInstance; 152 using content::SiteInstance;
153 using content::WebContents; 153 using content::WebContents;
154 154
155 namespace { 155 namespace {
156 156
157 const char* kPredefinedAllowedSocketOrigins[] = { 157 const char* kPredefinedAllowedSocketOrigins[] = {
158 "okddffdblfhhnmhodogpojmfkjmhinfp", // Test SSH Client 158 "okddffdblfhhnmhodogpojmfkjmhinfp", // Test SSH Client
159 "pnhechapfaindjhompbnflcldabbghjo", // HTerm App (SSH Client) 159 "pnhechapfaindjhompbnflcldabbghjo", // HTerm App (SSH Client)
160 "bglhmjfplikpjnfoegeomebmfnkjomhe" // see crbug.com/122126 160 "bglhmjfplikpjnfoegeomebmfnkjomhe", // see crbug.com/122126
161 "gbchcmhmhahfdphkhkmpfmihenigjmpp", // Chrome Remote Desktop
162 "kgngmbheleoaphbjbaiobfdepmghbfah", // Pre-release Chrome Remote Desktop
163 "odkaodonbgfohohmklejpjiejmcipmib", // Dogfood Chrome Remote Desktop
164 "ojoimpklfciegopdfgeenehpalipignm" // Chromoting canary
161 }; 165 };
162 166
163 // Handles rewriting Web UI URLs. 167 // Handles rewriting Web UI URLs.
164 bool HandleWebUI(GURL* url, content::BrowserContext* browser_context) { 168 bool HandleWebUI(GURL* url, content::BrowserContext* browser_context) {
165 if (!ChromeWebUIControllerFactory::GetInstance()->UseWebUIForURL( 169 if (!ChromeWebUIControllerFactory::GetInstance()->UseWebUIForURL(
166 browser_context, *url)) 170 browser_context, *url))
167 return false; 171 return false;
168 172
169 #if defined(OS_CHROMEOS) 173 #if defined(OS_CHROMEOS)
170 // Special case : in ChromeOS in Guest mode bookmarks and history are 174 // Special case : in ChromeOS in Guest mode bookmarks and history are
(...skipping 1457 matching lines...) Expand 10 before | Expand all | Expand 10 after
1628 #if defined(USE_NSS) 1632 #if defined(USE_NSS)
1629 crypto::CryptoModuleBlockingPasswordDelegate* 1633 crypto::CryptoModuleBlockingPasswordDelegate*
1630 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1634 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1631 const GURL& url) { 1635 const GURL& url) {
1632 return browser::NewCryptoModuleBlockingDialogDelegate( 1636 return browser::NewCryptoModuleBlockingDialogDelegate(
1633 browser::kCryptoModulePasswordKeygen, url.host()); 1637 browser::kCryptoModulePasswordKeygen, url.host());
1634 } 1638 }
1635 #endif 1639 #endif
1636 1640
1637 } // namespace chrome 1641 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698