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

Unified Diff: ash/test/ash_md_test_base.cc

Issue 2067223003: Parameterize Ash unittests to pass with material design enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: for further feedback Created 4 years, 6 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
new file mode 100644
index 0000000000000000000000000000000000000000..c8984ee1be9316b5541eeb0e7fd112b5eb65f19d
--- /dev/null
+++ b/ash/test/ash_md_test_base.cc
@@ -0,0 +1,35 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/test/ash_md_test_base.h"
+
+namespace ash {
+namespace test {
+
+AshMDTestBase::AshMDTestBase()
+ : md_maximized_window_height_offset_(0) {
James Cook 2016/06/16 16:08:56 nit: init in header
tdanderson 2016/06/21 19:52:21 Can you clarify what you mean here? Inlining a cto
James Cook 2016/06/21 22:17:54 I mean "int md_maximized_window_height_offset_ = 0
tdanderson 2016/06/22 16:51:55 Done.
+}
+
+AshMDTestBase::~AshMDTestBase() {
+}
+
+void AshMDTestBase::SetUp() {
+ test::AshTestBase::SetUp();
+ material_design_state_.reset(
+ new test::MaterialDesignControllerTestAPI(GetParam()));
+ md_maximized_window_height_offset_ =
+ ash::MaterialDesignController::IsMaterial() ? -1 : 0;
James Cook 2016/06/16 16:08:56 optional: maybe compute this based on the constant
tdanderson 2016/06/21 19:52:21 This is a great idea, done.
+}
+
+void AshMDTestBase::TearDown() {
+ material_design_state_.reset();
+ test::AshTestBase::TearDown();
+}
+
+int AshMDTestBase::GetMdMaximizedWindowHeightOffset() {
+ return md_maximized_window_height_offset_;
+}
+
+} // namespace test
+} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698