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

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

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 | « no previous file | chrome/browser/chrome_content_browser_client.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 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 bool* in_memory) OVERRIDE; 57 bool* in_memory) OVERRIDE;
58 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate( 58 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(
59 content::WebContents* web_contents) OVERRIDE; 59 content::WebContents* web_contents) OVERRIDE;
60 virtual void GuestWebContentsCreated( 60 virtual void GuestWebContentsCreated(
61 content::WebContents* guest_web_contents, 61 content::WebContents* guest_web_contents,
62 content::WebContents* embedder_web_contents) OVERRIDE; 62 content::WebContents* embedder_web_contents) OVERRIDE;
63 virtual void RenderProcessHostCreated( 63 virtual void RenderProcessHostCreated(
64 content::RenderProcessHost* host) OVERRIDE; 64 content::RenderProcessHost* host) OVERRIDE;
65 virtual bool ShouldUseProcessPerSite(content::BrowserContext* browser_context, 65 virtual bool ShouldUseProcessPerSite(content::BrowserContext* browser_context,
66 const GURL& effective_url) OVERRIDE; 66 const GURL& effective_url) OVERRIDE;
67 virtual GURL GetPossiblyPrivilegedURL(
68 content::BrowserContext* browser_context,
69 const GURL& url,
70 bool is_renderer_initiated,
71 content::SiteInstance* current_instance) OVERRIDE;
67 virtual GURL GetEffectiveURL(content::BrowserContext* browser_context, 72 virtual GURL GetEffectiveURL(content::BrowserContext* browser_context,
68 const GURL& url) OVERRIDE; 73 const GURL& url) OVERRIDE;
69 virtual void GetAdditionalWebUISchemes( 74 virtual void GetAdditionalWebUISchemes(
70 std::vector<std::string>* additional_schemes) OVERRIDE; 75 std::vector<std::string>* additional_schemes) OVERRIDE;
71 virtual net::URLRequestContextGetter* CreateRequestContext( 76 virtual net::URLRequestContextGetter* CreateRequestContext(
72 content::BrowserContext* browser_context, 77 content::BrowserContext* browser_context,
73 content::ProtocolHandlerMap* protocol_handlers) OVERRIDE; 78 content::ProtocolHandlerMap* protocol_handlers) OVERRIDE;
74 virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition( 79 virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
75 content::BrowserContext* browser_context, 80 content::BrowserContext* browser_context,
76 const base::FilePath& partition_path, 81 const base::FilePath& partition_path,
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 private: 254 private:
250 // Set of origins that can use TCP/UDP private APIs from NaCl. 255 // Set of origins that can use TCP/UDP private APIs from NaCl.
251 std::set<std::string> allowed_socket_origins_; 256 std::set<std::string> allowed_socket_origins_;
252 257
253 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 258 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
254 }; 259 };
255 260
256 } // namespace chrome 261 } // namespace chrome
257 262
258 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 263 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698