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

Unified Diff: chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc

Issue 11647017: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: stage changes to preserve history Created 8 years 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/views/tab_contents/chrome_web_contents_view_delegate_views.cc
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
index 772fc896f9572a5eaeaac43995b16bb6d3219a1b..50ade413d54b02f13a14d7c5dc1d6a951ee77962 100644
--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
@@ -74,11 +74,11 @@ bool ChromeWebContentsViewDelegateViews::Focus() {
// TODO(erg): WebContents used to own constrained windows, which is why
// this is here. Eventually this should be ported to a containing view
// specializing in constrained window management.
- if (constrained_window_tab_helper->constrained_window_count() > 0) {
+ if (constrained_window_tab_helper->dialog_count() > 0) {
ConstrainedWindow* window =
- *constrained_window_tab_helper->constrained_window_begin();
+ *constrained_window_tab_helper->dialog_begin();
DCHECK(window);
- window->FocusConstrainedWindow();
+ window->FocusWebContentsModalDialog();
return true;
}
}
« no previous file with comments | « chrome/browser/ui/views/ssl_client_certificate_selector.cc ('k') | chrome/browser/ui/views/web_intent_picker_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698