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

Unified Diff: chrome/browser/ui/views/tabs/tab.h

Issue 382693002: Fix possible bad cast in Tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: PassAs Created 6 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab.h
diff --git a/chrome/browser/ui/views/tabs/tab.h b/chrome/browser/ui/views/tabs/tab.h
index 25d37c979278ab46912364a900b4db929ce0e972..f1a52323f3464d96ea9c377f3d9f866894c7c755 100644
--- a/chrome/browser/ui/views/tabs/tab.h
+++ b/chrome/browser/ui/views/tabs/tab.h
@@ -26,6 +26,7 @@ class Animation;
class AnimationContainer;
class LinearAnimation;
class MultiAnimation;
+class ThrobAnimation;
}
namespace views {
class ImageButton;
@@ -216,9 +217,7 @@ class Tab : public gfx::AnimationDelegate,
// Paint various portions of the Tab
void PaintTabBackground(gfx::Canvas* canvas);
- void PaintInactiveTabBackgroundWithTitleChange(
- gfx::Canvas* canvas,
- gfx::MultiAnimation* animation);
+ void PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas);
void PaintInactiveTabBackground(gfx::Canvas* canvas);
void PaintInactiveTabBackgroundUsingResourceId(gfx::Canvas* canvas,
int tab_id);
@@ -327,7 +326,9 @@ class Tab : public gfx::AnimationDelegate,
bool should_display_crashed_favicon_;
// Whole-tab throbbing "pulse" animation.
- scoped_ptr<gfx::Animation> tab_animation_;
+ scoped_ptr<gfx::ThrobAnimation> pulse_animation_;
+
+ scoped_ptr<gfx::MultiAnimation> mini_title_change_animation_;
// Crash icon animation (in place of favicon).
scoped_ptr<gfx::LinearAnimation> crash_icon_animation_;
« 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