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

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

Issue 11647017: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 735fd9634929b6fc980d6db2e7073dbbf6ebba71..b2936372e54280e490ea3490a2a0e492ffc82c75 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -25,13 +25,13 @@
#include "chrome/browser/ui/bookmarks/bookmark_bar.h"
#include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
#include "chrome/browser/ui/browser_navigator.h"
-#include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/search/search_model_observer.h"
#include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
#include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "chrome/browser/ui/toolbar/toolbar_model.h"
+#include "chrome/browser/ui/web_contents_modal_dialog_manager_delegate.h"
#include "chrome/browser/ui/zoom/zoom_observer.h"
#include "chrome/common/content_settings.h"
#include "chrome/common/content_settings_types.h"
@@ -101,7 +101,7 @@ class Browser : public TabStripModelObserver,
public content::WebContentsDelegate,
public CoreTabHelperDelegate,
public SearchEngineTabHelperDelegate,
- public ConstrainedWindowTabHelperDelegate,
+ public WebContentsModalDialogManagerDelegate,
public BlockedContentTabHelperDelegate,
public BookmarkTabHelperDelegate,
public ZoomObserver,
@@ -680,10 +680,10 @@ class Browser : public TabStripModelObserver,
virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
Profile* profile) OVERRIDE;
- // Overridden from ConstrainedWindowTabHelperDelegate:
- virtual void SetTabContentBlocked(content::WebContents* web_contents,
- bool blocked) OVERRIDE;
- virtual bool GetConstrainedWindowTopCenter(gfx::Point* point) OVERRIDE;
+ // Overridden from WebContentsModalDialogManagerDelegate:
+ virtual void SetWebContentsBlocked(content::WebContents* web_contents,
+ bool blocked) OVERRIDE;
+ virtual bool GetDialogTopCenter(gfx::Point* point) OVERRIDE;
// Overridden from BlockedContentTabHelperDelegate:
virtual content::WebContents* GetConstrainingWebContents(

Powered by Google App Engine
This is Rietveld 408576698