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

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

Issue 9801002: Simplest backport of 117417. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/963/src/
Patch Set: 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 return true; 421 return true;
422 } 422 }
423 423
424 bool ChromeContentBrowserClient::IsURLSameAsAnySiteInstance(const GURL& url) { 424 bool ChromeContentBrowserClient::IsURLSameAsAnySiteInstance(const GURL& url) {
425 return url == GURL(chrome::kChromeUICrashURL) || 425 return url == GURL(chrome::kChromeUICrashURL) ||
426 url == GURL(chrome::kChromeUIKillURL) || 426 url == GURL(chrome::kChromeUIKillURL) ||
427 url == GURL(chrome::kChromeUIHangURL) || 427 url == GURL(chrome::kChromeUIHangURL) ||
428 url == GURL(chrome::kChromeUIShorthangURL); 428 url == GURL(chrome::kChromeUIShorthangURL);
429 } 429 }
430 430
431 bool ChromeContentBrowserClient::IsHandledURL(const GURL& url) {
432 return ProfileIOData::IsHandledURL(url);
433 }
434
431 bool ChromeContentBrowserClient::IsSuitableHost( 435 bool ChromeContentBrowserClient::IsSuitableHost(
432 content::RenderProcessHost* process_host, 436 content::RenderProcessHost* process_host,
433 const GURL& site_url) { 437 const GURL& site_url) {
434 Profile* profile = 438 Profile* profile =
435 Profile::FromBrowserContext(process_host->GetBrowserContext()); 439 Profile::FromBrowserContext(process_host->GetBrowserContext());
436 ExtensionService* service = profile->GetExtensionService(); 440 ExtensionService* service = profile->GetExtensionService();
437 extensions::ProcessMap* process_map = service->process_map(); 441 extensions::ProcessMap* process_map = service->process_map();
438 442
439 // Don't allow the Task Manager to share a process with anything else. 443 // Don't allow the Task Manager to share a process with anything else.
440 // Otherwise it can affect the renderers it is observing. 444 // Otherwise it can affect the renderers it is observing.
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after
1211 #if defined(USE_NSS) 1215 #if defined(USE_NSS)
1212 crypto::CryptoModuleBlockingPasswordDelegate* 1216 crypto::CryptoModuleBlockingPasswordDelegate*
1213 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1217 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1214 const GURL& url) { 1218 const GURL& url) {
1215 return browser::NewCryptoModuleBlockingDialogDelegate( 1219 return browser::NewCryptoModuleBlockingDialogDelegate(
1216 browser::kCryptoModulePasswordKeygen, url.host()); 1220 browser::kCryptoModulePasswordKeygen, url.host());
1217 } 1221 }
1218 #endif 1222 #endif
1219 1223
1220 } // namespace chrome 1224 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | content/browser/child_process_security_policy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698