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

Unified Diff: ash/test/ash_md_test_base.cc

Issue 2692663002: Gut ash::MaterialDesignController, and remove the about:flags entry. (Closed)
Patch Set: yet another rebase Created 3 years, 10 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
« no previous file with comments | « ash/test/ash_md_test_base.h ('k') | ash/test/ash_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
deleted file mode 100644
index 7e7418e5a1d60facf9182b5af9d3edf93daca565..0000000000000000000000000000000000000000
--- a/ash/test/ash_md_test_base.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// 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"
-
-#include "ash/common/shelf/shelf_constants.h"
-#include "ash/common/test/material_design_controller_test_api.h"
-
-namespace ash {
-namespace test {
-
-AshMDTestBase::AshMDTestBase() {}
-
-AshMDTestBase::~AshMDTestBase() {}
-
-void AshMDTestBase::SetUp() {
- int non_md_shelf_size = 0;
- int non_md_auto_hide_shelf_size = 0;
- int md_shelf_size = 0;
- int md_auto_hide_shelf_size = 0;
-
- {
- test::MaterialDesignControllerTestAPI md_state(
- MaterialDesignController::Mode::NON_MATERIAL);
- non_md_shelf_size = GetShelfConstant(SHELF_SIZE);
- non_md_auto_hide_shelf_size = GetShelfConstant(SHELF_INSETS_FOR_AUTO_HIDE);
- }
-
- {
- test::MaterialDesignControllerTestAPI md_state(GetParam());
- md_shelf_size = GetShelfConstant(SHELF_SIZE);
- md_auto_hide_shelf_size = GetShelfConstant(SHELF_INSETS_FOR_AUTO_HIDE);
- }
-
- md_maximized_window_height_offset_ = non_md_shelf_size - md_shelf_size;
- md_auto_hidden_shelf_height_offset_ =
- non_md_auto_hide_shelf_size - md_auto_hide_shelf_size;
-
- set_material_mode(GetParam());
-
- AshTestBase::SetUp();
-}
-
-int AshMDTestBase::GetMdMaximizedWindowHeightOffset() {
- return md_maximized_window_height_offset_;
-}
-
-int AshMDTestBase::GetMdAutoHiddenShelfHeightOffset() {
- return md_auto_hidden_shelf_height_offset_;
-}
-
-} // namespace test
-} // namespace ash
« no previous file with comments | « ash/test/ash_md_test_base.h ('k') | ash/test/ash_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698