| Index: ash/common/shelf/shelf_background_animator_unittest.cc
|
| diff --git a/ash/common/shelf/shelf_background_animator_unittest.cc b/ash/common/shelf/shelf_background_animator_unittest.cc
|
| index 9c40483b2a58bc95028db38a73fdb5035fd83ffd..6a395cae45b82e1c0d72539f23f17e0bb47efc14 100644
|
| --- a/ash/common/shelf/shelf_background_animator_unittest.cc
|
| +++ b/ash/common/shelf/shelf_background_animator_unittest.cc
|
| @@ -37,17 +37,13 @@ class TestShelfBackgroundObserver : public ShelfBackgroundAnimatorObserver {
|
|
|
| int item_background_alpha() const { return item_background_alpha_; }
|
|
|
| - int asset_background_alpha() const { return asset_background_alpha_; }
|
| -
|
| // ShelfBackgroundObserver:
|
| void UpdateShelfOpaqueBackground(int alpha) override;
|
| - void UpdateShelfAssetBackground(int alpha) override;
|
| void UpdateShelfItemBackground(int alpha) override;
|
|
|
| private:
|
| int opaque_background_alpha_ = 0;
|
| int item_background_alpha_ = 0;
|
| - int asset_background_alpha_ = 0;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestShelfBackgroundObserver);
|
| };
|
| @@ -56,10 +52,6 @@ void TestShelfBackgroundObserver::UpdateShelfOpaqueBackground(int alpha) {
|
| opaque_background_alpha_ = alpha;
|
| }
|
|
|
| -void TestShelfBackgroundObserver::UpdateShelfAssetBackground(int alpha) {
|
| - asset_background_alpha_ = alpha;
|
| -}
|
| -
|
| void TestShelfBackgroundObserver::UpdateShelfItemBackground(int alpha) {
|
| item_background_alpha_ = alpha;
|
| }
|
| @@ -82,10 +74,6 @@ class ShelfBackgroundAnimatorTestApi {
|
| return animator_->opaque_background_animator_.get();
|
| }
|
|
|
| - BackgroundAnimator* asset_background_animator() const {
|
| - return animator_->asset_background_animator_.get();
|
| - }
|
| -
|
| BackgroundAnimator* item_background_animator() const {
|
| return animator_->item_background_animator_.get();
|
| }
|
| @@ -172,7 +160,6 @@ void ShelfBackgroundAnimatorTestBase::PaintBackground(
|
|
|
| void ShelfBackgroundAnimatorTestBase::SetAlphaValuesOnObserver(int alpha) {
|
| observer_.UpdateShelfOpaqueBackground(alpha);
|
| - observer_.UpdateShelfAssetBackground(alpha);
|
| observer_.UpdateShelfItemBackground(alpha);
|
| }
|
|
|
| @@ -200,7 +187,6 @@ TEST_F(ShelfBackgroundAnimatorNonMDTest, DefaultBackground) {
|
|
|
| EXPECT_EQ(SHELF_BACKGROUND_DEFAULT, animator_->target_background_type());
|
| EXPECT_EQ(0, observer_.opaque_background_alpha());
|
| - EXPECT_EQ(0, observer_.asset_background_alpha());
|
| EXPECT_EQ(expected_translucent_alpha(), observer_.item_background_alpha());
|
| }
|
|
|
| @@ -210,7 +196,6 @@ TEST_F(ShelfBackgroundAnimatorNonMDTest, OverlapBackground) {
|
|
|
| EXPECT_EQ(SHELF_BACKGROUND_OVERLAP, animator_->target_background_type());
|
| EXPECT_EQ(0, observer_.opaque_background_alpha());
|
| - EXPECT_EQ(expected_translucent_alpha(), observer_.asset_background_alpha());
|
| EXPECT_EQ(expected_translucent_alpha(), observer_.item_background_alpha());
|
| }
|
|
|
| @@ -220,7 +205,6 @@ TEST_F(ShelfBackgroundAnimatorNonMDTest, MaximizedBackground) {
|
|
|
| EXPECT_EQ(SHELF_BACKGROUND_MAXIMIZED, animator_->target_background_type());
|
| EXPECT_EQ(kMaxAlpha, observer_.opaque_background_alpha());
|
| - EXPECT_EQ(expected_translucent_alpha(), observer_.asset_background_alpha());
|
| EXPECT_EQ(kMaxAlpha, observer_.item_background_alpha());
|
| }
|
|
|
| @@ -283,7 +267,6 @@ TEST_F(ShelfBackgroundAnimatorMDTest, ObserversUpdatedWhenAdded) {
|
| animator_->AddObserver(&observer_);
|
|
|
| EXPECT_NE(observer_.opaque_background_alpha(), kDummyAlpha);
|
| - EXPECT_NE(observer_.asset_background_alpha(), kDummyAlpha);
|
| EXPECT_NE(observer_.item_background_alpha(), kDummyAlpha);
|
| }
|
|
|
| @@ -293,7 +276,6 @@ TEST_F(ShelfBackgroundAnimatorMDTest, DefaultBackground) {
|
|
|
| EXPECT_EQ(SHELF_BACKGROUND_DEFAULT, animator_->target_background_type());
|
| EXPECT_EQ(0, observer_.opaque_background_alpha());
|
| - EXPECT_EQ(0, observer_.asset_background_alpha());
|
| EXPECT_EQ(expected_translucent_alpha(), observer_.item_background_alpha());
|
| }
|
|
|
| @@ -303,7 +285,6 @@ TEST_F(ShelfBackgroundAnimatorMDTest, OverlapBackground) {
|
|
|
| EXPECT_EQ(SHELF_BACKGROUND_OVERLAP, animator_->target_background_type());
|
| EXPECT_EQ(expected_translucent_alpha(), observer_.opaque_background_alpha());
|
| - EXPECT_EQ(0, observer_.asset_background_alpha());
|
| EXPECT_EQ(0, observer_.item_background_alpha());
|
| }
|
|
|
| @@ -313,7 +294,6 @@ TEST_F(ShelfBackgroundAnimatorMDTest, MaximizedBackground) {
|
|
|
| EXPECT_EQ(SHELF_BACKGROUND_MAXIMIZED, animator_->target_background_type());
|
| EXPECT_EQ(kMaxAlpha, observer_.opaque_background_alpha());
|
| - EXPECT_EQ(0, observer_.asset_background_alpha());
|
| EXPECT_EQ(0, observer_.item_background_alpha());
|
| }
|
|
|
| @@ -325,15 +305,12 @@ TEST_F(ShelfBackgroundAnimatorMDTest, ExistingAnimatorsAreReused) {
|
|
|
| const BackgroundAnimator* opaque_animator =
|
| test_api_->opaque_background_animator();
|
| - const BackgroundAnimator* asset_animator =
|
| - test_api_->asset_background_animator();
|
| const BackgroundAnimator* item_animator =
|
| test_api_->item_background_animator();
|
|
|
| PaintBackground(SHELF_BACKGROUND_DEFAULT);
|
|
|
| EXPECT_EQ(opaque_animator, test_api_->opaque_background_animator());
|
| - EXPECT_EQ(asset_animator, test_api_->asset_background_animator());
|
| EXPECT_EQ(item_animator, test_api_->item_background_animator());
|
| }
|
|
|
| @@ -350,8 +327,6 @@ TEST_F(ShelfBackgroundAnimatorMDTest,
|
|
|
| const BackgroundAnimator* opaque_animator =
|
| test_api_->opaque_background_animator();
|
| - const BackgroundAnimator* asset_animator =
|
| - test_api_->asset_background_animator();
|
| const BackgroundAnimator* item_animator =
|
| test_api_->item_background_animator();
|
|
|
| @@ -360,7 +335,6 @@ TEST_F(ShelfBackgroundAnimatorMDTest,
|
| BACKGROUND_CHANGE_ANIMATE);
|
|
|
| EXPECT_NE(opaque_animator, test_api_->opaque_background_animator());
|
| - EXPECT_NE(asset_animator, test_api_->asset_background_animator());
|
| EXPECT_NE(item_animator, test_api_->item_background_animator());
|
| }
|
|
|
| @@ -374,8 +348,6 @@ TEST_F(ShelfBackgroundAnimatorMDTest,
|
|
|
| const BackgroundAnimator* opaque_animator =
|
| test_api_->opaque_background_animator();
|
| - const BackgroundAnimator* asset_animator =
|
| - test_api_->asset_background_animator();
|
| const BackgroundAnimator* item_animator =
|
| test_api_->item_background_animator();
|
|
|
| @@ -383,7 +355,6 @@ TEST_F(ShelfBackgroundAnimatorMDTest,
|
| PaintBackground(SHELF_BACKGROUND_OVERLAP);
|
|
|
| EXPECT_NE(opaque_animator, test_api_->opaque_background_animator());
|
| - EXPECT_NE(asset_animator, test_api_->asset_background_animator());
|
| EXPECT_NE(item_animator, test_api_->item_background_animator());
|
| }
|
|
|
| @@ -404,7 +375,6 @@ TEST_F(ShelfBackgroundAnimatorMDTest,
|
| PaintBackground(SHELF_BACKGROUND_DEFAULT);
|
|
|
| EXPECT_NE(observer_.opaque_background_alpha(), kDummyAlpha);
|
| - EXPECT_NE(observer_.asset_background_alpha(), kDummyAlpha);
|
| EXPECT_NE(observer_.item_background_alpha(), kDummyAlpha);
|
| }
|
|
|
|
|