| Index: chrome/browser/ui/panels/panel_browser_frame_view.h
|
| diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.h b/chrome/browser/ui/panels/panel_browser_frame_view.h
|
| index 0ce5b38573c7a7d8e1e8e88daf1ec0c4ac45ed58..552a062866c9bc3a89d0b85943caf0c35141a4b2 100644
|
| --- a/chrome/browser/ui/panels/panel_browser_frame_view.h
|
| +++ b/chrome/browser/ui/panels/panel_browser_frame_view.h
|
| @@ -9,11 +9,13 @@
|
| #include "base/gtest_prod_util.h"
|
| #include "base/message_loop.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 PanelBrowserView;
|
| class SkPaint;
|
| +class TabIconView;
|
| +
|
| namespace gfx {
|
| class Font;
|
| class ImageSkia;
|
| @@ -28,7 +30,7 @@ class Label;
|
|
|
| class PanelBrowserFrameView : public BrowserNonClientFrameView,
|
| public views::ButtonListener,
|
| - public TabIconView::TabIconViewModel {
|
| + public chrome::TabIconViewModel {
|
| public:
|
| PanelBrowserFrameView(BrowserFrame* frame, PanelBrowserView* browser_view);
|
| virtual ~PanelBrowserFrameView();
|
| @@ -79,7 +81,7 @@ class PanelBrowserFrameView : 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;
|
|
|
|
|