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

Side by Side Diff: chrome/browser/views/tabs/tab_renderer.h

Issue 155882: Make the tab close button color match the tab text.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/views/tabs/tab_renderer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__ 5 #ifndef CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__
6 #define CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__ 6 #define CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__
7 7
8 #include "app/animation.h" 8 #include "app/animation.h"
9 #include "app/slide_animation.h" 9 #include "app/slide_animation.h"
10 #include "app/throb_animation.h" 10 #include "app/throb_animation.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 148
149 // Current state of the animation. 149 // Current state of the animation.
150 AnimationState animation_state_; 150 AnimationState animation_state_;
151 151
152 // The current index into the Animation image strip. 152 // The current index into the Animation image strip.
153 int animation_frame_; 153 int animation_frame_;
154 154
155 // Close Button. 155 // Close Button.
156 views::ImageButton* close_button_; 156 views::ImageButton* close_button_;
157 157
158 // The current color of the close button.
159 SkColor close_button_color_;
160
158 // Hover animation. 161 // Hover animation.
159 scoped_ptr<SlideAnimation> hover_animation_; 162 scoped_ptr<SlideAnimation> hover_animation_;
160 163
161 // Pulse animation. 164 // Pulse animation.
162 scoped_ptr<ThrobAnimation> pulse_animation_; 165 scoped_ptr<ThrobAnimation> pulse_animation_;
163 166
164 // Model data. We store this here so that we don't need to ask the underlying 167 // Model data. We store this here so that we don't need to ask the underlying
165 // model, which is tricky since instances of this object can outlive the 168 // model, which is tricky since instances of this object can outlive the
166 // corresponding objects in the underlying model. 169 // corresponding objects in the underlying model.
167 struct TabData { 170 struct TabData {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 209
207 ThemeProvider* theme_provider_; 210 ThemeProvider* theme_provider_;
208 211
209 static void InitClass(); 212 static void InitClass();
210 static bool initialized_; 213 static bool initialized_;
211 214
212 DISALLOW_EVIL_CONSTRUCTORS(TabRenderer); 215 DISALLOW_EVIL_CONSTRUCTORS(TabRenderer);
213 }; 216 };
214 217
215 #endif // CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__ 218 #endif // CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/views/tabs/tab_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698