summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/frame
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-04 17:28:56 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-04 17:28:56 +0000
commit6015b89218a24dba57f0c3f20aff861da0af083e (patch)
tree345a54ea00da152ff731d2320d9f6420f5f4a9ec /chrome/browser/views/frame
parent0969d172f87f4692c7fdc94bc5aa12173b89b34e (diff)
downloadchromium_src-6015b89218a24dba57f0c3f20aff861da0af083e.zip
chromium_src-6015b89218a24dba57f0c3f20aff861da0af083e.tar.gz
chromium_src-6015b89218a24dba57f0c3f20aff861da0af083e.tar.bz2
Fix bustage. The app panel frame change went in moments before mine :-(
BUG=none TEST=none TBR=sky Review URL: http://codereview.chromium.org/577002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
-rwxr-xr-xchrome/browser/views/frame/app_panel_browser_frame_view.cc2
-rwxr-xr-xchrome/browser/views/frame/app_panel_browser_frame_view.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/views/frame/app_panel_browser_frame_view.cc
index a220eee..d8a67c5 100755
--- a/chrome/browser/views/frame/app_panel_browser_frame_view.cc
+++ b/chrome/browser/views/frame/app_panel_browser_frame_view.cc
@@ -103,7 +103,7 @@ AppPanelBrowserFrameView::~AppPanelBrowserFrameView() {
// AppPanelBrowserFrameView, BrowserNonClientFrameView implementation:
gfx::Rect AppPanelBrowserFrameView::GetBoundsForTabStrip(
- TabStrip* tabstrip) const {
+ BaseTabStrip* tabstrip) const {
// App panels never show a tab strip.
NOTREACHED();
return gfx::Rect();
diff --git a/chrome/browser/views/frame/app_panel_browser_frame_view.h b/chrome/browser/views/frame/app_panel_browser_frame_view.h
index 1366cc9..6476ee8 100755
--- a/chrome/browser/views/frame/app_panel_browser_frame_view.h
+++ b/chrome/browser/views/frame/app_panel_browser_frame_view.h
@@ -11,9 +11,9 @@
#include "views/controls/button/button.h"
#include "views/window/non_client_view.h"
+class BaseTabStrip;
class BrowserView;
class TabContents;
-class TabStrip;
namespace gfx {
class Font;
}
@@ -33,7 +33,7 @@ class AppPanelBrowserFrameView : public BrowserNonClientFrameView,
virtual ~AppPanelBrowserFrameView();
// Overridden from BrowserNonClientFrameView:
- virtual gfx::Rect GetBoundsForTabStrip(TabStrip* tabstrip) const;
+ virtual gfx::Rect GetBoundsForTabStrip(BaseTabStrip* tabstrip) const;
virtual void UpdateThrobber(bool running);
virtual gfx::Size GetMinimumSize();