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

Side by Side Diff: content/public/browser/content_browser_client.cc

Issue 10690048: Clean up RenderViewHostManager swapping logic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflict Created 8 years, 1 month 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 | « content/public/browser/content_browser_client.h ('k') | 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 "content/public/browser/content_browser_client.h" 5 #include "content/public/browser/content_browser_client.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "googleurl/src/gurl.h" 8 #include "googleurl/src/gurl.h"
9 #include "ui/gfx/image/image_skia.h" 9 #include "ui/gfx/image/image_skia.h"
10 10
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 bool ContentBrowserClient::IsSuitableHost(RenderProcessHost* process_host, 47 bool ContentBrowserClient::IsSuitableHost(RenderProcessHost* process_host,
48 const GURL& site_url) { 48 const GURL& site_url) {
49 return true; 49 return true;
50 } 50 }
51 51
52 bool ContentBrowserClient::ShouldTryToUseExistingProcessHost( 52 bool ContentBrowserClient::ShouldTryToUseExistingProcessHost(
53 BrowserContext* browser_context, const GURL& url) { 53 BrowserContext* browser_context, const GURL& url) {
54 return false; 54 return false;
55 } 55 }
56 56
57 bool ContentBrowserClient::ShouldSwapProcessesForNavigation( 57 bool ContentBrowserClient::ShouldSwapBrowsingInstanceForNavigation(
58 const GURL& current_url, 58 BrowserContext* browser_context,
59 const GURL& new_url) { 59 const GURL& current_url,
60 const GURL& new_url) {
60 return false; 61 return false;
61 } 62 }
62 63
63 bool ContentBrowserClient::ShouldSwapProcessesForRedirect( 64 bool ContentBrowserClient::ShouldSwapProcessesForRedirect(
64 ResourceContext* resource_context, const GURL& current_url, 65 ResourceContext* resource_context, const GURL& current_url,
65 const GURL& new_url) { 66 const GURL& new_url) {
66 return false; 67 return false;
67 } 68 }
68 69
69 std::string ContentBrowserClient::GetCanonicalEncodingNameByAliasName( 70 std::string ContentBrowserClient::GetCanonicalEncodingNameByAliasName(
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 #endif 265 #endif
265 266
266 #if defined(USE_NSS) 267 #if defined(USE_NSS)
267 crypto::CryptoModuleBlockingPasswordDelegate* 268 crypto::CryptoModuleBlockingPasswordDelegate*
268 ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { 269 ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) {
269 return NULL; 270 return NULL;
270 } 271 }
271 #endif 272 #endif
272 273
273 } // namespace content 274 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698