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

Unified Diff: chrome/browser/gtk/tabs/tab_renderer_gtk_unittest.cc

Issue 155601: GTK Themes: Tint throbbers like we tint all other buttons in the interface. (Closed)
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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/gtk/tabs/tab_renderer_gtk.cc ('k') | chrome/browser/gtk/tabs/tab_strip_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/tabs/tab_renderer_gtk_unittest.cc
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk_unittest.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk_unittest.cc
index 0304d26de74138f419d00271589c2f66c7d23a11..10189daa5f1f00ce7b896972c7ae1aabcf12248d 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk_unittest.cc
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk_unittest.cc
@@ -14,23 +14,20 @@ const int kTestLoadingAnimationFrameCount = 10;
const int kTestWaitingAnimationFrameCount = 40;
const int kTestWaitingToLoadingFrameCountRatio = 4;
-const LoadingAnimation::Data kMockAnimationData = {
- NULL, // waiting_animation_frames
- NULL, // loading_animation_frames
- kTestLoadingAnimationFrameCount,
- kTestWaitingAnimationFrameCount,
- kTestWaitingToLoadingFrameCountRatio,
-};
+const LoadingAnimation::Data kMockAnimationData =
+ LoadingAnimation::Data(kTestLoadingAnimationFrameCount,
+ kTestWaitingAnimationFrameCount,
+ kTestWaitingToLoadingFrameCountRatio);
TEST(LoadingAnimationTest, InitialState) {
- LoadingAnimation loading_animation(&kMockAnimationData);
+ LoadingAnimation loading_animation(kMockAnimationData);
EXPECT_EQ(TabRendererGtk::ANIMATION_NONE,
loading_animation.animation_state());
EXPECT_EQ(0, loading_animation.animation_frame());
}
TEST(LoadingAnimationTest, AdvanceWaitingFrames) {
- LoadingAnimation loading_animation(&kMockAnimationData);
+ LoadingAnimation loading_animation(kMockAnimationData);
loading_animation.ValidateLoadingAnimation(TabRendererGtk::ANIMATION_WAITING);
EXPECT_EQ(TabRendererGtk::ANIMATION_WAITING,
loading_animation.animation_state());
@@ -57,7 +54,7 @@ TEST(LoadingAnimationTest, AdvanceWaitingFrames) {
}
TEST(LoadingAnimationTest, AdvanceFromWaitingToLoading) {
- LoadingAnimation loading_animation(&kMockAnimationData);
+ LoadingAnimation loading_animation(kMockAnimationData);
for (int i = 0; i < 2 * kTestWaitingToLoadingFrameCountRatio; ++i) {
loading_animation.ValidateLoadingAnimation(
TabRendererGtk::ANIMATION_WAITING);
« no previous file with comments | « chrome/browser/gtk/tabs/tab_renderer_gtk.cc ('k') | chrome/browser/gtk/tabs/tab_strip_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698