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

Unified Diff: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h

Issue 10736063: views: Extract TabIconViewModel into its own header file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
Index: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h
diff --git a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h
index 4a742f72ec995702d512d902522a04eeda8e504a..c9d62779b8205bf70973f4d06561fb93c5df470f 100644
--- a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h
+++ b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h
@@ -10,9 +10,11 @@
#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;
}
@@ -23,7 +25,7 @@ class ImageButton;
class BrowserNonClientFrameViewAsh
: public BrowserNonClientFrameView,
public views::ButtonListener,
- public TabIconView::TabIconViewModel,
+ public chrome::TabIconViewModel,
public chrome::search::ToolbarSearchAnimatorObserver {
public:
static const char kViewClassName[];
@@ -61,7 +63,7 @@ class BrowserNonClientFrameViewAsh
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;
« no previous file with comments | « chrome/browser/ui/panels/panel_browser_frame_view.cc ('k') | chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698