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

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

Issue 13877028: Renderer initiated navigations from non instant process should not fall into instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing another recently added test. Created 7 years, 7 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 | « 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/files/file_path.h" 7 #include "base/files/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
11 namespace content { 11 namespace content {
12 12
13 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( 13 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts(
14 const MainFunctionParams& parameters) { 14 const MainFunctionParams& parameters) {
15 return NULL; 15 return NULL;
16 } 16 }
17 17
18 WebContentsViewPort* ContentBrowserClient::OverrideCreateWebContentsView( 18 WebContentsViewPort* ContentBrowserClient::OverrideCreateWebContentsView(
19 WebContents* web_contents, 19 WebContents* web_contents,
20 RenderViewHostDelegateView** render_view_host_delegate_view) { 20 RenderViewHostDelegateView** render_view_host_delegate_view) {
21 return NULL; 21 return NULL;
22 } 22 }
23 23
24 WebContentsViewDelegate* ContentBrowserClient::GetWebContentsViewDelegate( 24 WebContentsViewDelegate* ContentBrowserClient::GetWebContentsViewDelegate(
25 WebContents* web_contents) { 25 WebContents* web_contents) {
26 return NULL; 26 return NULL;
27 } 27 }
28 28
29 GURL ContentBrowserClient::GetPossiblyPrivilegedURL(
30 content::BrowserContext* browser_context,
31 const GURL& url,
32 bool is_renderer_initiated,
33 SiteInstance* current_instance) {
34 return url;
35 }
36
29 GURL ContentBrowserClient::GetEffectiveURL(BrowserContext* browser_context, 37 GURL ContentBrowserClient::GetEffectiveURL(BrowserContext* browser_context,
30 const GURL& url) { 38 const GURL& url) {
31 return url; 39 return url;
32 } 40 }
33 41
34 bool ContentBrowserClient::ShouldUseProcessPerSite( 42 bool ContentBrowserClient::ShouldUseProcessPerSite(
35 BrowserContext* browser_context, const GURL& effective_url) { 43 BrowserContext* browser_context, const GURL& effective_url) {
36 return false; 44 return false;
37 } 45 }
38 46
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 #endif 278 #endif
271 279
272 #if defined(USE_NSS) 280 #if defined(USE_NSS)
273 crypto::CryptoModuleBlockingPasswordDelegate* 281 crypto::CryptoModuleBlockingPasswordDelegate*
274 ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { 282 ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) {
275 return NULL; 283 return NULL;
276 } 284 }
277 #endif 285 #endif
278 286
279 } // namespace content 287 } // 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