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

Unified Diff: chrome/browser/ui/tabs/tab_utils.h

Issue 1354823002: Render the tab close button as a vector-based icon. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 3 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
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.mm ('k') | chrome/browser/ui/tabs/tab_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/tabs/tab_utils.h
diff --git a/chrome/browser/ui/tabs/tab_utils.h b/chrome/browser/ui/tabs/tab_utils.h
index 3f1b1cdb8d6e1b649a25bbf5d5a670d46965217a..8f45711c59b0c8d69a796413ef24fd74254b3d7b 100644
--- a/chrome/browser/ui/tabs/tab_utils.h
+++ b/chrome/browser/ui/tabs/tab_utils.h
@@ -11,6 +11,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "content/public/browser/web_contents_user_data.h"
+#include "third_party/skia/include/core/SkColor.h"
class TabStripModel;
@@ -23,10 +24,6 @@ class Animation;
class Image;
} // namespace gfx
-namespace ui {
-class ThemeProvider;
-}
-
// Media state for a tab. In reality, more than one of these may apply. See
// comments for GetTabMediaStateForContents() below.
enum TabMediaState {
@@ -87,13 +84,13 @@ TabMediaState GetTabMediaStateForContents(content::WebContents* contents);
// Returns a cached image, to be shown by the media indicator for the given
// |media_state|. Uses the global ui::ResourceBundle shared instance.
gfx::Image GetTabMediaIndicatorImage(TabMediaState media_state,
- const ui::ThemeProvider* tp);
+ SkColor button_color);
// Returns the cached image, to be shown by the media indicator button for mouse
// hover/pressed, when the indicator is in the given |media_state|. Uses the
// global ui::ResourceBundle shared instance.
gfx::Image GetTabMediaIndicatorAffordanceImage(TabMediaState media_state,
- const ui::ThemeProvider* tp);
+ SkColor button_color);
// Returns a non-continuous Animation that performs a fade-in or fade-out
// appropriate for the given |next_media_state|. This is used by the tab media
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.mm ('k') | chrome/browser/ui/tabs/tab_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698