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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
61 bool MaterialDesignController::IsOverviewMaterial() { | 61 bool MaterialDesignController::IsOverviewMaterial() { |
62 return MaterialDesignController::IsMaterial(); | 62 return MaterialDesignController::IsMaterial(); |
63 } | 63 } |
64 | 64 |
65 // static | 65 // static |
66 bool MaterialDesignController::IsShelfMaterial() { | 66 bool MaterialDesignController::IsShelfMaterial() { |
67 return MaterialDesignController::IsMaterialExperimental(); | 67 return MaterialDesignController::IsMaterialExperimental(); |
68 } | 68 } |
69 | 69 |
70 // static | 70 // static |
71 bool MaterialDesignController::IsImmersiveModeEnabled() { | |
72 return IsMaterialExperimental() || IsMaterialNormal(); | |
tdanderson
2016/09/08 21:19:14
Just call IsMaterial() instead.
yiyix
2016/09/08 22:36:18
Done.
| |
73 } | |
74 | |
75 // static | |
71 bool MaterialDesignController::IsSystemTrayMenuMaterial() { | 76 bool MaterialDesignController::IsSystemTrayMenuMaterial() { |
72 return MaterialDesignController::IsMaterialExperimental(); | 77 return MaterialDesignController::IsMaterialExperimental(); |
73 } | 78 } |
74 | 79 |
75 // static | 80 // static |
76 bool MaterialDesignController::UseMaterialDesignSystemIcons() { | 81 bool MaterialDesignController::UseMaterialDesignSystemIcons() { |
77 return MaterialDesignController::IsMaterialExperimental(); | 82 return MaterialDesignController::IsMaterialExperimental(); |
78 } | 83 } |
79 | 84 |
80 // static | 85 // static |
(...skipping 25 matching lines...) Expand all Loading... | |
106 void MaterialDesignController::SetMode(Mode mode) { | 111 void MaterialDesignController::SetMode(Mode mode) { |
107 mode_ = mode; | 112 mode_ = mode; |
108 } | 113 } |
109 | 114 |
110 // static | 115 // static |
111 void MaterialDesignController::Uninitialize() { | 116 void MaterialDesignController::Uninitialize() { |
112 mode_ = Mode::UNINITIALIZED; | 117 mode_ = Mode::UNINITIALIZED; |
113 } | 118 } |
114 | 119 |
115 } // namespace ash | 120 } // namespace ash |
OLD | NEW |