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

Unified Diff: ash/test/ash_md_test_base.cc

Issue 2165693002: Fix tests in when MD is set to EXPERIMENTAL by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 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
Index: ash/test/ash_md_test_base.cc
diff --git a/ash/test/ash_md_test_base.cc b/ash/test/ash_md_test_base.cc
index b7bda04dd5a215e92d0a8a611ce3a1b7e1e499a8..a0edbd35450a5d31044c0d372b1503c802ffa0b1 100644
--- a/ash/test/ash_md_test_base.cc
+++ b/ash/test/ash_md_test_base.cc
@@ -20,12 +20,18 @@ void AshMDTestBase::SetUp() {
material_design_state_.reset(new test::MaterialDesignControllerTestAPI(
MaterialDesignController::Mode::NON_MATERIAL));
const int non_md_shelf_size = GetShelfConstant(SHELF_SIZE);
+ const int non_md_auto_hide_shelf_size =
+ GetShelfConstant(SHELF_INSETS_FOR_AUTO_HIDE);
material_design_state_.reset(
new test::MaterialDesignControllerTestAPI(GetParam()));
const int md_state_shelf_size = GetShelfConstant(SHELF_SIZE);
+ const int md_state_auto_hide_shelf_size =
+ GetShelfConstant(SHELF_INSETS_FOR_AUTO_HIDE);
md_maximized_window_height_offset_ = non_md_shelf_size - md_state_shelf_size;
+ md_auto_hidden_shelf_height_offset_ =
+ non_md_auto_hide_shelf_size - md_state_auto_hide_shelf_size;
}
void AshMDTestBase::TearDown() {
@@ -37,5 +43,9 @@ int AshMDTestBase::GetMdMaximizedWindowHeightOffset() {
return md_maximized_window_height_offset_;
}
+int AshMDTestBase::GetMdAutoHiddenShelfHeightOffset() {
+ return md_auto_hidden_shelf_height_offset_;
+}
+
} // namespace test
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698