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

Side by Side Diff: chrome/browser/ui/blocked_content/blocked_content_container.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/ui/blocked_content/blocked_content_container.h" 5 #include "chrome/browser/ui/blocked_content/blocked_content_container.h"
6 6
7 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" 7 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
8 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 8 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
9 #include "content/browser/tab_contents/tab_contents.h" 9 #include "content/browser/tab_contents/tab_contents.h"
10 #include "ui/gfx/rect.h" 10 #include "ui/gfx/rect.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // TODO(adriansc): Remove this method once refactoring changed all call sites. 110 // TODO(adriansc): Remove this method once refactoring changed all call sites.
111 TabContents* BlockedContentContainer::OpenURLFromTab( 111 TabContents* BlockedContentContainer::OpenURLFromTab(
112 TabContents* source, 112 TabContents* source,
113 const GURL& url, 113 const GURL& url,
114 const GURL& referrer, 114 const GURL& referrer,
115 WindowOpenDisposition disposition, 115 WindowOpenDisposition disposition,
116 content::PageTransition transition) { 116 content::PageTransition transition) {
117 return owner_->tab_contents()->OpenURL(OpenURLParams(url, 117 return owner_->tab_contents()->OpenURL(OpenURLParams(url,
118 referrer, 118 referrer,
119 disposition, 119 disposition,
120 transition)); 120 transition,
121 false));
121 } 122 }
122 123
123 TabContents* BlockedContentContainer::OpenURLFromTab( 124 TabContents* BlockedContentContainer::OpenURLFromTab(
124 TabContents* source, 125 TabContents* source,
125 const OpenURLParams& params) { 126 const OpenURLParams& params) {
126 return owner_->tab_contents()->OpenURL(params); 127 return owner_->tab_contents()->OpenURL(params);
127 } 128 }
128 129
129 void BlockedContentContainer::AddNewContents(TabContents* source, 130 void BlockedContentContainer::AddNewContents(TabContents* source,
130 TabContents* new_contents, 131 TabContents* new_contents,
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 bool BlockedContentContainer::ShouldSuppressDialogs() { 171 bool BlockedContentContainer::ShouldSuppressDialogs() {
171 // Suppress JavaScript dialogs when inside a constrained popup window (because 172 // Suppress JavaScript dialogs when inside a constrained popup window (because
172 // that activates them and breaks them out of the constrained window jail). 173 // that activates them and breaks them out of the constrained window jail).
173 return true; 174 return true;
174 } 175 }
175 176
176 TabContentsWrapper* BlockedContentContainer::GetConstrainingContentsWrapper( 177 TabContentsWrapper* BlockedContentContainer::GetConstrainingContentsWrapper(
177 TabContentsWrapper* source) { 178 TabContentsWrapper* source) {
178 return owner_; 179 return owner_;
179 } 180 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698