| 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/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" |
| 11 #include "base/trace_event/trace_event.h" | 11 #include "base/trace_event/trace_event.h" |
| 12 | 12 |
| 13 #if defined(OS_CHROMEOS) | 13 #if defined(OS_CHROMEOS) |
| 14 #include "ui/chromeos/material_design_icon_controller.h" | 14 #include "ui/chromeos/material_design_icon_controller.h" |
| 15 #endif // OS_CHROMEOS | 15 #endif // OS_CHROMEOS |
| 16 | 16 |
| 17 namespace ash { | 17 namespace ash { |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 void MaterialDesignController::SetMode(Mode mode) { | 101 void MaterialDesignController::SetMode(Mode mode) { |
| 102 mode_ = mode; | 102 mode_ = mode; |
| 103 } | 103 } |
| 104 | 104 |
| 105 // static | 105 // static |
| 106 void MaterialDesignController::Uninitialize() { | 106 void MaterialDesignController::Uninitialize() { |
| 107 mode_ = Mode::UNINITIALIZED; | 107 mode_ = Mode::UNINITIALIZED; |
| 108 } | 108 } |
| 109 | 109 |
| 110 } // namespace ash | 110 } // namespace ash |
| OLD | NEW |