| 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 "ash/material_design/material_design_controller.h" | 5 #include "ash/common/material_design/material_design_controller.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 namespace ash { | 9 namespace ash { |
| 10 | 10 |
| 11 // static | 11 // static |
| 12 bool MaterialDesignController::IsShelfMaterial() { | 12 bool MaterialDesignController::IsShelfMaterial() { |
| 13 return true; | 13 return true; |
| 14 } | 14 } |
| 15 | 15 |
| 16 // static | 16 // static |
| 17 bool MaterialDesignController::IsSystemTrayMenuMaterial() { | 17 bool MaterialDesignController::IsSystemTrayMenuMaterial() { |
| 18 return true; | 18 return true; |
| 19 } | 19 } |
| 20 | 20 |
| 21 // static | 21 // static |
| 22 bool MaterialDesignController::UseMaterialDesignSystemIcons() { | 22 bool MaterialDesignController::UseMaterialDesignSystemIcons() { |
| 23 return true; | 23 return true; |
| 24 } | 24 } |
| 25 | 25 |
| 26 } // namespace ash | 26 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2734733002:
Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
