| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 #endif // OS_CHROMEOS | 51 #endif // OS_CHROMEOS |
| 52 } | 52 } |
| 53 | 53 |
| 54 // static | 54 // static |
| 55 MaterialDesignController::Mode MaterialDesignController::GetMode() { | 55 MaterialDesignController::Mode MaterialDesignController::GetMode() { |
| 56 DCHECK_NE(mode_, Mode::UNINITIALIZED); | 56 DCHECK_NE(mode_, Mode::UNINITIALIZED); |
| 57 return mode_; | 57 return mode_; |
| 58 } | 58 } |
| 59 | 59 |
| 60 // static | 60 // static |
| 61 bool MaterialDesignController::IsOverviewMaterial() { | |
| 62 return MaterialDesignController::IsMaterial(); | |
| 63 } | |
| 64 | |
| 65 // static | |
| 66 bool MaterialDesignController::IsShelfMaterial() { | 61 bool MaterialDesignController::IsShelfMaterial() { |
| 67 return MaterialDesignController::IsMaterialExperimental(); | 62 return MaterialDesignController::IsMaterialExperimental(); |
| 68 } | 63 } |
| 69 | 64 |
| 70 // static | 65 // static |
| 71 bool MaterialDesignController::IsImmersiveModeMaterial() { | 66 bool MaterialDesignController::IsImmersiveModeMaterial() { |
| 72 return IsMaterial(); | 67 return IsMaterial(); |
| 73 } | 68 } |
| 74 | 69 |
| 75 // static | 70 // static |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 void MaterialDesignController::SetMode(Mode mode) { | 106 void MaterialDesignController::SetMode(Mode mode) { |
| 112 mode_ = mode; | 107 mode_ = mode; |
| 113 } | 108 } |
| 114 | 109 |
| 115 // static | 110 // static |
| 116 void MaterialDesignController::Uninitialize() { | 111 void MaterialDesignController::Uninitialize() { |
| 117 mode_ = Mode::UNINITIALIZED; | 112 mode_ = Mode::UNINITIALIZED; |
| 118 } | 113 } |
| 119 | 114 |
| 120 } // namespace ash | 115 } // namespace ash |
| OLD | NEW |