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

Unified Diff: chrome/browser/ui/browser.cc

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
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 3fbae1123fef928c841cf811c0e8906fa61f5076..2318e315865317d11abd6813ab786d30b5145c7e 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2878,7 +2878,8 @@ TabContents* Browser::OpenURL(const GURL& url,
WindowOpenDisposition disposition,
content::PageTransition transition) {
return OpenURLFromTab(NULL,
- OpenURLParams(url, referrer, disposition, transition));
+ OpenURLParams(url, referrer, disposition, transition,
+ false));
}
TabContents* Browser::OpenURL(const OpenURLParams& params) {
@@ -3304,7 +3305,7 @@ TabContents* Browser::OpenURLFromTab(TabContents* source,
WindowOpenDisposition disposition,
content::PageTransition transition) {
return OpenURLFromTab(source, OpenURLParams(url, referrer, disposition,
- transition));
+ transition, false));
}
TabContents* Browser::OpenURLFromTab(TabContents* source,
@@ -3319,6 +3320,7 @@ TabContents* Browser::OpenURLFromTab(TabContents* source,
nav_params.window_action = browser::NavigateParams::SHOW_WINDOW;
nav_params.user_gesture = true;
nav_params.override_encoding = params.override_encoding;
+ nav_params.is_renderer_initiated = params.is_renderer_initiated;
browser::Navigate(&nav_params);
return nav_params.target_contents ?
« no previous file with comments | « chrome/browser/ui/blocked_content/blocked_content_container.cc ('k') | chrome/browser/ui/browser_navigator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698