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

Unified Diff: content/browser/tab_contents/navigation_controller.h

Issue 8224023: Don't show URL for pending new navigations initiated by the renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/site_instance_unittest.cc ('k') | content/browser/tab_contents/navigation_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/navigation_controller.h
diff --git a/content/browser/tab_contents/navigation_controller.h b/content/browser/tab_contents/navigation_controller.h
index cadf2d5bcf866fdb170232b7168c9510646a1af1..712705798b1964f1eb3371f002d2dfaba73325fb 100644
--- a/content/browser/tab_contents/navigation_controller.h
+++ b/content/browser/tab_contents/navigation_controller.h
@@ -180,6 +180,13 @@ class CONTENT_EXPORT NavigationController {
content::PageTransition type,
const std::string& extra_headers);
+ // Same as LoadURL, but for renderer-initiated navigations. This state is
+ // important for tracking whether to display pending URLs.
+ void LoadURLFromRenderer(const GURL& url,
+ const GURL& referrer,
+ content::PageTransition type,
+ const std::string& extra_headers);
+
// Loads the current page if this NavigationController was restored from
// history and the current page has not loaded yet.
void LoadIfNecessary();
@@ -331,6 +338,7 @@ class CONTENT_EXPORT NavigationController {
const GURL& url,
const GURL& referrer,
content::PageTransition transition,
+ bool is_renderer_initiated,
const std::string& extra_headers,
content::BrowserContext* browser_context);
« no previous file with comments | « content/browser/site_instance_unittest.cc ('k') | content/browser/tab_contents/navigation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698