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/common/ash_switches.h" | 7 #include "ash/common/ash_switches.h" |
8 #include "ash/common/material_design/material_design_controller.h" | 8 #include "ash/common/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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 } | 43 } |
44 | 44 |
45 // static | 45 // static |
46 MaterialDesignController::Mode MaterialDesignController::GetMode() { | 46 MaterialDesignController::Mode MaterialDesignController::GetMode() { |
47 DCHECK_NE(mode_, Mode::UNINITIALIZED); | 47 DCHECK_NE(mode_, Mode::UNINITIALIZED); |
48 return mode_; | 48 return mode_; |
49 } | 49 } |
50 | 50 |
51 // static | 51 // static |
52 bool MaterialDesignController::IsShelfMaterial() { | 52 bool MaterialDesignController::IsShelfMaterial() { |
53 return MaterialDesignController::IsMaterialExperimental(); | 53 return IsMaterial(); |
54 } | 54 } |
55 | 55 |
56 // static | 56 // static |
57 bool MaterialDesignController::IsImmersiveModeMaterial() { | 57 bool MaterialDesignController::IsImmersiveModeMaterial() { |
58 return IsMaterial(); | 58 return IsMaterial(); |
59 } | 59 } |
60 | 60 |
61 // static | 61 // static |
62 bool MaterialDesignController::IsSystemTrayMenuMaterial() { | 62 bool MaterialDesignController::IsSystemTrayMenuMaterial() { |
63 return MaterialDesignController::IsMaterialExperimental(); | 63 return IsMaterial(); |
64 } | 64 } |
65 | 65 |
66 // static | 66 // static |
67 bool MaterialDesignController::UseMaterialDesignSystemIcons() { | 67 bool MaterialDesignController::UseMaterialDesignSystemIcons() { |
68 return MaterialDesignController::IsMaterialExperimental(); | 68 return IsMaterial(); |
69 } | 69 } |
70 | 70 |
71 // static | 71 // static |
72 MaterialDesignController::Mode MaterialDesignController::mode() { | 72 MaterialDesignController::Mode MaterialDesignController::mode() { |
73 return mode_; | 73 return mode_; |
74 } | 74 } |
75 | 75 |
76 // static | 76 // static |
77 bool MaterialDesignController::IsMaterial() { | 77 bool MaterialDesignController::IsMaterial() { |
78 return IsMaterialExperimental() || IsMaterialNormal(); | 78 return IsMaterialExperimental() || IsMaterialNormal(); |
(...skipping 18 matching lines...) Expand all Loading... |
97 void MaterialDesignController::SetMode(Mode mode) { | 97 void MaterialDesignController::SetMode(Mode mode) { |
98 mode_ = mode; | 98 mode_ = mode; |
99 } | 99 } |
100 | 100 |
101 // static | 101 // static |
102 void MaterialDesignController::Uninitialize() { | 102 void MaterialDesignController::Uninitialize() { |
103 mode_ = Mode::UNINITIALIZED; | 103 mode_ = Mode::UNINITIALIZED; |
104 } | 104 } |
105 | 105 |
106 } // namespace ash | 106 } // namespace ash |
OLD | NEW |