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

Side by Side Diff: chrome/browser/ui/views/tabs/tab.h

Issue 1400783002: Use a layer transform for the waiting throbber Base URL: https://chromium.googlesource.com/chromium/src.git@20151006-MacViewsBrowser-Power
Patch Set: Fix color Created 5 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/tabs/tab.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_UI_VIEWS_TABS_TAB_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_
6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 static int GetImmersiveHeight(); 153 static int GetImmersiveHeight();
154 154
155 private: 155 private:
156 friend class TabTest; 156 friend class TabTest;
157 FRIEND_TEST_ALL_PREFIXES(TabTest, CloseButtonLayout); 157 FRIEND_TEST_ALL_PREFIXES(TabTest, CloseButtonLayout);
158 158
159 friend class TabStripTest; 159 friend class TabStripTest;
160 FRIEND_TEST_ALL_PREFIXES(TabStripTest, TabHitTestMaskWhenStacked); 160 FRIEND_TEST_ALL_PREFIXES(TabStripTest, TabHitTestMaskWhenStacked);
161 FRIEND_TEST_ALL_PREFIXES(TabStripTest, TabCloseButtonVisibilityWhenStacked); 161 FRIEND_TEST_ALL_PREFIXES(TabStripTest, TabCloseButtonVisibilityWhenStacked);
162 162
163 class ThrobberView;
164
163 // The animation object used to swap the favicon with the sad tab icon. 165 // The animation object used to swap the favicon with the sad tab icon.
164 class FaviconCrashAnimation; 166 class FaviconCrashAnimation;
165 class TabCloseButton; 167 class TabCloseButton;
166 168
167 // Contains a cached image and the values used to generate it. 169 // Contains a cached image and the values used to generate it.
168 struct ImageCacheEntry { 170 struct ImageCacheEntry {
169 ImageCacheEntry(); 171 ImageCacheEntry();
170 ~ImageCacheEntry(); 172 ~ImageCacheEntry();
171 173
172 // ID of the resource used. 174 // ID of the resource used.
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 // Whole-tab throbbing "pulse" animation. 349 // Whole-tab throbbing "pulse" animation.
348 scoped_ptr<gfx::ThrobAnimation> pulse_animation_; 350 scoped_ptr<gfx::ThrobAnimation> pulse_animation_;
349 351
350 scoped_ptr<gfx::MultiAnimation> pinned_title_change_animation_; 352 scoped_ptr<gfx::MultiAnimation> pinned_title_change_animation_;
351 353
352 // Crash icon animation (in place of favicon). 354 // Crash icon animation (in place of favicon).
353 scoped_ptr<gfx::LinearAnimation> crash_icon_animation_; 355 scoped_ptr<gfx::LinearAnimation> crash_icon_animation_;
354 356
355 scoped_refptr<gfx::AnimationContainer> animation_container_; 357 scoped_refptr<gfx::AnimationContainer> animation_container_;
356 358
357 views::View* throbber_; 359 ThrobberView* throbber_;
358 MediaIndicatorButton* media_indicator_button_; 360 MediaIndicatorButton* media_indicator_button_;
359 views::ImageButton* close_button_; 361 views::ImageButton* close_button_;
360 views::Label* title_; 362 views::Label* title_;
361 363
362 bool tab_activated_with_last_tap_down_; 364 bool tab_activated_with_last_tap_down_;
363 365
364 views::GlowHoverController hover_controller_; 366 views::GlowHoverController hover_controller_;
365 367
366 // The bounds of various sections of the display. 368 // The bounds of various sections of the display.
367 gfx::Rect favicon_bounds_; 369 gfx::Rect favicon_bounds_;
(...skipping 28 matching lines...) Expand all
396 SkColor button_color_; 398 SkColor button_color_;
397 399
398 // As the majority of the tabs are inactive, and painting tabs is slowish, 400 // As the majority of the tabs are inactive, and painting tabs is slowish,
399 // we cache a handful of the inactive tab backgrounds here. 401 // we cache a handful of the inactive tab backgrounds here.
400 static ImageCache* image_cache_; 402 static ImageCache* image_cache_;
401 403
402 DISALLOW_COPY_AND_ASSIGN(Tab); 404 DISALLOW_COPY_AND_ASSIGN(Tab);
403 }; 405 };
404 406
405 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_ 407 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698