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

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

Issue 19872007: Use process per site instance for "Instant". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 7 years, 5 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 | chrome/browser/search/instant_service.h » ('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 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 content::BrowserContext* browser_context, const GURL& effective_url) { 928 content::BrowserContext* browser_context, const GURL& effective_url) {
929 // Non-extension, non-Instant URLs should generally use 929 // Non-extension, non-Instant URLs should generally use
930 // process-per-site-instance. Because we expect to use the effective URL, 930 // process-per-site-instance. Because we expect to use the effective URL,
931 // URLs for hosted apps (apart from bookmark apps) should have an extension 931 // URLs for hosted apps (apart from bookmark apps) should have an extension
932 // scheme by now. 932 // scheme by now.
933 933
934 Profile* profile = Profile::FromBrowserContext(browser_context); 934 Profile* profile = Profile::FromBrowserContext(browser_context);
935 if (!profile) 935 if (!profile)
936 return false; 936 return false;
937 937
938 if (chrome::ShouldAssignURLToInstantRenderer(effective_url, profile)) 938 if (chrome::ShouldUseProcessPerSiteForInstantURL(effective_url, profile))
939 return true; 939 return true;
940 940
941 #if !defined(OS_CHROMEOS) 941 #if !defined(OS_CHROMEOS)
942 if (SigninManager::IsWebBasedSigninFlowURL(effective_url)) 942 if (SigninManager::IsWebBasedSigninFlowURL(effective_url))
943 return true; 943 return true;
944 #endif 944 #endif
945 945
946 if (!effective_url.SchemeIs(extensions::kExtensionScheme)) 946 if (!effective_url.SchemeIs(extensions::kExtensionScheme))
947 return false; 947 return false;
948 948
(...skipping 1511 matching lines...) Expand 10 before | Expand all | Expand 10 after
2460 #if defined(USE_NSS) 2460 #if defined(USE_NSS)
2461 crypto::CryptoModuleBlockingPasswordDelegate* 2461 crypto::CryptoModuleBlockingPasswordDelegate*
2462 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2462 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2463 const GURL& url) { 2463 const GURL& url) {
2464 return chrome::NewCryptoModuleBlockingDialogDelegate( 2464 return chrome::NewCryptoModuleBlockingDialogDelegate(
2465 chrome::kCryptoModulePasswordKeygen, url.host()); 2465 chrome::kCryptoModulePasswordKeygen, url.host());
2466 } 2466 }
2467 #endif 2467 #endif
2468 2468
2469 } // namespace chrome 2469 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/search/instant_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698