OLD | NEW |
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 <string> | 5 #include <string> |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/material_design/material_design_controller.h" | 8 #include "ash/material_design/material_design_controller.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 return IsMaterialExperimental() || mode_ == Mode::MATERIAL_NORMAL; | 47 return IsMaterialExperimental() || mode_ == Mode::MATERIAL_NORMAL; |
48 } | 48 } |
49 | 49 |
50 // static | 50 // static |
51 bool MaterialDesignController::IsMaterialExperimental() { | 51 bool MaterialDesignController::IsMaterialExperimental() { |
52 DCHECK_NE(mode_, Mode::UNINITIALIZED); | 52 DCHECK_NE(mode_, Mode::UNINITIALIZED); |
53 return mode_ == Mode::MATERIAL_EXPERIMENTAL; | 53 return mode_ == Mode::MATERIAL_EXPERIMENTAL; |
54 } | 54 } |
55 | 55 |
56 // static | 56 // static |
| 57 bool MaterialDesignController::IsShelfMaterial() { |
| 58 return MaterialDesignController::IsMaterialExperimental(); |
| 59 } |
| 60 |
| 61 // static |
57 MaterialDesignController::Mode MaterialDesignController::mode() { | 62 MaterialDesignController::Mode MaterialDesignController::mode() { |
58 return mode_; | 63 return mode_; |
59 } | 64 } |
60 | 65 |
61 // static | 66 // static |
62 MaterialDesignController::Mode MaterialDesignController::DefaultMode() { | 67 MaterialDesignController::Mode MaterialDesignController::DefaultMode() { |
63 return Mode::NON_MATERIAL; | 68 return Mode::NON_MATERIAL; |
64 } | 69 } |
65 | 70 |
66 // static | 71 // static |
67 void MaterialDesignController::SetMode(Mode mode) { | 72 void MaterialDesignController::SetMode(Mode mode) { |
68 mode_ = mode; | 73 mode_ = mode; |
69 } | 74 } |
70 | 75 |
71 // static | 76 // static |
72 void MaterialDesignController::Uninitialize() { | 77 void MaterialDesignController::Uninitialize() { |
73 mode_ = Mode::UNINITIALIZED; | 78 mode_ = Mode::UNINITIALIZED; |
74 } | 79 } |
75 | 80 |
76 } // namespace ui | 81 } // namespace ui |
OLD | NEW |