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

Unified Diff: ash/test/ash_md_test_base.h

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.h
diff --git a/ash/test/ash_md_test_base.h b/ash/test/ash_md_test_base.h
new file mode 100644
index 0000000000000000000000000000000000000000..e68ad34fc98d0deb21dadb1e5fc63a5b9be2ff03
--- /dev/null
+++ b/ash/test/ash_md_test_base.h
@@ -0,0 +1,42 @@
+// 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.
+
+#ifndef ASH_TEST_ASH_MD_TEST_BASE_H_
+#define ASH_TEST_ASH_MD_TEST_BASE_H_
+
+#include "ash/common/material_design/material_design_controller.h"
+#include "ash/test/ash_test_base.h"
+#include "ash/test/material_design_controller_test_api.h"
+
+namespace ash {
+namespace test {
+
+class AshMDTestBase
+ : public ash::test::AshTestBase,
James Cook 2016/06/16 16:08:56 nit: no ash::test::
tdanderson 2016/06/21 19:52:21 Done.
+ public testing::WithParamInterface<ash::MaterialDesignController::Mode> {
+ public:
+ AshMDTestBase();
+ ~AshMDTestBase() override;
+
+ // AshTestBase:
+ void SetUp() override;
+ void TearDown() override;
+
+ int GetMdMaximizedWindowHeightOffset();
+
+ private:
+ std::unique_ptr<MaterialDesignControllerTestAPI>
+ material_design_state_;
+
+ // The material design shelf is taller (by 1px) so use this offset to
+ // adjust the expected height of a maximized window.
+ int md_maximized_window_height_offset_;
+
+ DISALLOW_COPY_AND_ASSIGN(AshMDTestBase);
+};
+
+} // namespace test
+} // namespace ash
+
+#endif // ASH_TEST_ASH_MD_TEST_BASE_H_

Powered by Google App Engine
This is Rietveld 408576698