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

Side by Side Diff: ash/test/ash_md_test_base.cc

Issue 2053113002: Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into animate_shelf_chip_backgrounds Created 4 years, 4 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 | « ash/test/ash_md_test_base.h ('k') | ash/test/ash_test_helper.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #include "ash/test/ash_md_test_base.h" 5 #include "ash/test/ash_md_test_base.h"
6 6
7 #include "ash/common/shelf/shelf_constants.h" 7 #include "ash/common/shelf/shelf_constants.h"
8 #include "ash/test/material_design_controller_test_api.h" 8 #include "ash/common/test/material_design_controller_test_api.h"
9 9
10 namespace ash { 10 namespace ash {
11 namespace test { 11 namespace test {
12 12
13 AshMDTestBase::AshMDTestBase() {} 13 AshMDTestBase::AshMDTestBase() {}
14 14
15 AshMDTestBase::~AshMDTestBase() {} 15 AshMDTestBase::~AshMDTestBase() {}
16 16
17 void AshMDTestBase::SetUp() { 17 void AshMDTestBase::SetUp() {
18 AshTestBase::SetUp(); 18 AshTestBase::SetUp();
(...skipping 23 matching lines...) Expand all
42 int AshMDTestBase::GetMdMaximizedWindowHeightOffset() { 42 int AshMDTestBase::GetMdMaximizedWindowHeightOffset() {
43 return md_maximized_window_height_offset_; 43 return md_maximized_window_height_offset_;
44 } 44 }
45 45
46 int AshMDTestBase::GetMdAutoHiddenShelfHeightOffset() { 46 int AshMDTestBase::GetMdAutoHiddenShelfHeightOffset() {
47 return md_auto_hidden_shelf_height_offset_; 47 return md_auto_hidden_shelf_height_offset_;
48 } 48 }
49 49
50 } // namespace test 50 } // namespace test
51 } // namespace ash 51 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_md_test_base.h ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698