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

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

Issue 7880003: content: Move constrained window code from TabContents to TabContentsWrapper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mac compile (add forward declaration to file that didn't have it) Created 9 years, 3 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
« no previous file with comments | « chrome/browser/tab_contents/web_contents_unittest.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index ed58dab28f4964056673f19a45203578e2ad9012..588a0cf2cb0e98d606841a46a7f982c869dac49e 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -33,6 +33,7 @@
#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/search_engines/search_engine_tab_helper_delegate.h"
#include "chrome/browser/ui/shell_dialogs.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
@@ -72,6 +73,7 @@ class Browser : public TabHandlerDelegate,
public TabContentsDelegate,
public TabContentsWrapperDelegate,
public SearchEngineTabHelperDelegate,
+ public ConstrainedWindowTabHelperDelegate,
public BlockedContentTabHelperDelegate,
public BookmarkTabHelperDelegate,
public PageNavigator,
@@ -916,8 +918,6 @@ class Browser : public TabHandlerDelegate,
virtual void ContentsMouseEvent(
TabContents* source, const gfx::Point& location, bool motion) OVERRIDE;
virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;
- virtual void SetTabContentBlocked(TabContents* contents,
- bool blocked) OVERRIDE;
virtual void TabContentsFocused(TabContents* tab_content) OVERRIDE;
virtual bool TakeFocus(bool reverse) OVERRIDE;
virtual bool IsApplication() const OVERRIDE;
@@ -1009,6 +1009,10 @@ class Browser : public TabHandlerDelegate,
virtual void ConfirmAddSearchProvider(const TemplateURL* template_url,
Profile* profile) OVERRIDE;
+ // Overridden from ConstrainedWindowTabHelperDelegate:
+ virtual void SetTabContentBlocked(TabContentsWrapper* contents,
+ bool blocked) OVERRIDE;
+
// Overridden from BlockedContentTabHelperDelegate:
virtual TabContentsWrapper* GetConstrainingContentsWrapper(
TabContentsWrapper* source) OVERRIDE;
« no previous file with comments | « chrome/browser/tab_contents/web_contents_unittest.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698