views: Extract TabIconViewModel into its own header file.

chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
 #define CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/search/search_types.h"
 #include "chrome/browser/ui/search/toolbar_search_animator_observer.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"  // ButtonListener
 
+class TabIconView;
+
 namespace ash {
 class FramePainter;
 }
 namespace views {
 class ImageButton;
 }
 
 class BrowserNonClientFrameViewAsh
     : public BrowserNonClientFrameView,
       public views::ButtonListener,
-      public TabIconView::TabIconViewModel,
+      public chrome::TabIconViewModel,
       public chrome::search::ToolbarSearchAnimatorObserver {
  public:
   static const char kViewClassName[];
 
   BrowserNonClientFrameViewAsh(BrowserFrame* frame, BrowserView* browser_view);
   virtual ~BrowserNonClientFrameViewAsh();
 
   void Init();
 
   // BrowserNonClientFrameView overrides:
@@ skipping 17 matching lines @@
   virtual void Layout() OVERRIDE;
   virtual std::string GetClassName() const OVERRIDE;
   virtual bool HitTest(const gfx::Point& l) const OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual gfx::Size GetMinimumSize() OVERRIDE;
 
   // views::ButtonListener overrides:
   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;
 
   // Overridden from chrome::search::ToolbarSearchAnimatorObserver:
   virtual void OnToolbarBackgroundAnimatorProgressed() OVERRIDE;
   virtual void OnToolbarBackgroundAnimatorCanceled(
       TabContents* tab_contents) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, UseShortHeader);
@@ skipping 32 matching lines @@
   scoped_ptr<ash::FramePainter> frame_painter_;
 
   // If true the |size_button_| minimizes, otherwise it toggles between
   // maximized and restored.
   bool size_button_minimizes_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_