| Index: chrome/browser/ui/views/frame/app_panel_browser_frame_view.h
|
| diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h
|
| index ef83960bbb5fb38a2f3b1024f9fd80e7186c49f5..3aca67b4a3b630d4b16ab26718c12da6da46b49a 100644
|
| --- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h
|
| +++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h
|
| @@ -6,21 +6,23 @@
|
| #define CHROME_BROWSER_UI_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_
|
|
|
| #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
|
| -#include "chrome/browser/ui/views/tab_icon_view.h"
|
| +#include "chrome/browser/ui/views/tab_icon_view_model.h"
|
| #include "ui/views/controls/button/button.h"
|
|
|
| class BrowserFrame;
|
| class BrowserView;
|
| +class TabIconView;
|
|
|
| namespace views {
|
| class ImageButton;
|
| }
|
| +
|
| // The frame view which is used for Application Panels.
|
| // TODO(rafaelw): Refactor. This shares much duplicated code with
|
| // OpaqueBrowserFrameView.
|
| class AppPanelBrowserFrameView : public BrowserNonClientFrameView,
|
| public views::ButtonListener,
|
| - public TabIconView::TabIconViewModel {
|
| + public chrome::TabIconViewModel {
|
| public:
|
| // Constructs a non-client view for an BrowserFrame.
|
| AppPanelBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);
|
| @@ -51,7 +53,7 @@ class AppPanelBrowserFrameView : public BrowserNonClientFrameView,
|
| virtual void ButtonPressed(views::Button* sender, const views::Event& event)
|
| OVERRIDE;
|
|
|
| - // Overridden from TabIconView::TabIconViewModel:
|
| + // Overridden from chrome::TabIconViewModel:
|
| virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
|
| virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE;
|
|
|
|
|