Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Side by Side Diff: ash/common/material_design/material_design_controller.cc

Issue 2690443002: cros-md: Remove the non-MD immersive mode code paths (Closed)
Patch Set: remove unused conditions Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 IsMaterial(); 53 return IsMaterial();
54 } 54 }
55 55
56 // static 56 // static
57 bool MaterialDesignController::IsImmersiveModeMaterial() {
58 return IsMaterial();
59 }
60
61 // static
62 bool MaterialDesignController::IsSystemTrayMenuMaterial() { 57 bool MaterialDesignController::IsSystemTrayMenuMaterial() {
63 return IsMaterial(); 58 return IsMaterial();
64 } 59 }
65 60
66 // static 61 // static
67 bool MaterialDesignController::UseMaterialDesignSystemIcons() { 62 bool MaterialDesignController::UseMaterialDesignSystemIcons() {
68 return IsMaterial(); 63 return IsMaterial();
69 } 64 }
70 65
71 // static 66 // static
(...skipping 25 matching lines...) Expand all
97 void MaterialDesignController::SetMode(Mode mode) { 92 void MaterialDesignController::SetMode(Mode mode) {
98 mode_ = mode; 93 mode_ = mode;
99 } 94 }
100 95
101 // static 96 // static
102 void MaterialDesignController::Uninitialize() { 97 void MaterialDesignController::Uninitialize() {
103 mode_ = Mode::UNINITIALIZED; 98 mode_ = Mode::UNINITIALIZED;
104 } 99 }
105 100
106 } // namespace ash 101 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698