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

Unified Diff: chrome/browser/ui/gtk/constrained_window_gtk.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/gtk/constrained_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc
index 75e79acd0fe44e4a41f103d368c19fda8b698fe6..2894dbc09f728323f331777691d5fbc49a0fae1e 100644
--- a/chrome/browser/ui/gtk/constrained_window_gtk.cc
+++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc
@@ -75,14 +75,14 @@ ConstrainedWindowGtk::ConstrainedWindowGtk(
ConstrainedWindowTabHelper* constrained_window_tab_helper =
ConstrainedWindowTabHelper::FromWebContents(web_contents_);
- constrained_window_tab_helper->AddConstrainedDialog(this);
+ constrained_window_tab_helper->AddDialog(this);
}
ConstrainedWindowGtk::~ConstrainedWindowGtk() {
border_.Destroy();
}
-void ConstrainedWindowGtk::ShowConstrainedWindow() {
+void ConstrainedWindowGtk::ShowWebContentsModalDialog() {
gtk_widget_show_all(border_.get());
// We collaborate with WebContentsView and stick ourselves in the
@@ -92,7 +92,7 @@ void ConstrainedWindowGtk::ShowConstrainedWindow() {
visible_ = true;
}
-void ConstrainedWindowGtk::CloseConstrainedWindow() {
+void ConstrainedWindowGtk::CloseWebContentsModalDialog() {
if (visible_)
ContainingView()->RemoveConstrainedWindow(this);
delegate_->DeleteDelegate();
@@ -103,7 +103,7 @@ void ConstrainedWindowGtk::CloseConstrainedWindow() {
delete this;
}
-void ConstrainedWindowGtk::FocusConstrainedWindow() {
+void ConstrainedWindowGtk::FocusWebContentsModalDialog() {
GtkWidget* focus_widget = delegate_->GetFocusWidget();
if (!focus_widget)
return;
@@ -142,7 +142,7 @@ gboolean ConstrainedWindowGtk::OnKeyPress(GtkWidget* sender,
// on widget().
MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(&ConstrainedWindowGtk::CloseConstrainedWindow,
+ base::Bind(&ConstrainedWindowGtk::CloseWebContentsModalDialog,
weak_factory_.GetWeakPtr()));
return TRUE;
}
@@ -156,5 +156,5 @@ void ConstrainedWindowGtk::OnHierarchyChanged(GtkWidget* sender,
if (!gtk_widget_is_toplevel(gtk_widget_get_toplevel(widget())))
return;
- FocusConstrainedWindow();
+ FocusWebContentsModalDialog();
}
« no previous file with comments | « chrome/browser/ui/gtk/constrained_window_gtk.h ('k') | chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698