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

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

Issue 22407017: Remove whitelist restriction for Shared Modules on dev channel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unit test + rebase Created 7 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc » ('j') | 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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 "ojoimpklfciegopdfgeenehpalipignm", // Chromoting canary 265 "ojoimpklfciegopdfgeenehpalipignm", // Chromoting canary
266 "cbkkbcmdlboombapidmoeolnmdacpkch", // see crbug.com/129089 266 "cbkkbcmdlboombapidmoeolnmdacpkch", // see crbug.com/129089
267 "hhnbmknkdabfoieppbbljkhkfjcmcbjh", // see crbug.com/134099 267 "hhnbmknkdabfoieppbbljkhkfjcmcbjh", // see crbug.com/134099
268 "mablfbjkhmhkmefkjjacnbaikjkipphg", // see crbug.com/134099 268 "mablfbjkhmhkmefkjjacnbaikjkipphg", // see crbug.com/134099
269 "pdeelgamlgannhelgoegilelnnojegoh", // see crbug.com/134099 269 "pdeelgamlgannhelgoegilelnnojegoh", // see crbug.com/134099
270 "cabapfdbkniadpollkckdnedaanlciaj", // see crbug.com/134099 270 "cabapfdbkniadpollkckdnedaanlciaj", // see crbug.com/134099
271 "mapljbgnjledlpdmlchihnmeclmefbba", // see crbug.com/134099 271 "mapljbgnjledlpdmlchihnmeclmefbba", // see crbug.com/134099
272 "ghbfeebgmiidnnmeobbbaiamklmpbpii", // see crbug.com/134099 272 "ghbfeebgmiidnnmeobbbaiamklmpbpii", // see crbug.com/134099
273 "jdfhpkjeckflbbleddjlpimecpbjdeep", // see crbug.com/142514 273 "jdfhpkjeckflbbleddjlpimecpbjdeep", // see crbug.com/142514
274 "iabmpiboiopbgfabjmgeedhcmjenhbla", // see crbug.com/165080 274 "iabmpiboiopbgfabjmgeedhcmjenhbla", // see crbug.com/165080
275 "B7CF8A292249681AF81771650BA4CEEAF19A4560", // see crbug.com/165080 275 "B7CF8A292249681AF81771650BA4CEEAF19A4560", // see crbug.com/165080
276 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/234789 276 "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/234789
277 "7525AF4F66763A70A883C4700529F647B470E4D2", // see crbug.com/238084 277 "4EB74897CB187C7633357C2FE832E0AD6A44883A", // see crbug.com/234789
278 "0B549507088E1564D672F7942EB87CA4DAD73972", // see crbug.com/238084 278 "7525AF4F66763A70A883C4700529F647B470E4D2", // see crbug.com/238084
279 "864288364E239573E777D3E0E36864E590E95C74" // see crbug.com/238084 279 "0B549507088E1564D672F7942EB87CA4DAD73972", // see crbug.com/238084
280 "864288364E239573E777D3E0E36864E590E95C74" // see crbug.com/238084
280 }; 281 };
281 #endif 282 #endif
282 283
283 // Returns a copy of the given url with its host set to given host and path set 284 // Returns a copy of the given url with its host set to given host and path set
284 // to given path. Other parts of the url will be the same. 285 // to given path. Other parts of the url will be the same.
285 GURL ReplaceURLHostAndPath(const GURL& url, 286 GURL ReplaceURLHostAndPath(const GURL& url,
286 const std::string& host, 287 const std::string& host,
287 const std::string& path) { 288 const std::string& path) {
288 url_canon::Replacements<char> replacements; 289 url_canon::Replacements<char> replacements;
289 replacements.SetHost(host.c_str(), 290 replacements.SetHost(host.c_str(),
(...skipping 2262 matching lines...) Expand 10 before | Expand all | Expand 10 after
2552 #if defined(USE_NSS) 2553 #if defined(USE_NSS)
2553 crypto::CryptoModuleBlockingPasswordDelegate* 2554 crypto::CryptoModuleBlockingPasswordDelegate*
2554 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2555 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2555 const GURL& url) { 2556 const GURL& url) {
2556 return chrome::NewCryptoModuleBlockingDialogDelegate( 2557 return chrome::NewCryptoModuleBlockingDialogDelegate(
2557 chrome::kCryptoModulePasswordKeygen, url.host()); 2558 chrome::kCryptoModulePasswordKeygen, url.host());
2558 } 2559 }
2559 #endif 2560 #endif
2560 2561
2561 } // namespace chrome 2562 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698