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

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

Issue 2174643002: [ash-md] Updates ash shelf tooltips to MD (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
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::IsTooltipMaterial() {
72 return MaterialDesignController::IsMaterialExperimental();
73 }
74
75 // static
71 bool MaterialDesignController::UseMaterialDesignSystemIcons() { 76 bool MaterialDesignController::UseMaterialDesignSystemIcons() {
72 return MaterialDesignController::IsMaterialExperimental(); 77 return MaterialDesignController::IsMaterialExperimental();
73 } 78 }
74 79
75 // static 80 // static
76 MaterialDesignController::Mode MaterialDesignController::mode() { 81 MaterialDesignController::Mode MaterialDesignController::mode() {
77 return mode_; 82 return mode_;
78 } 83 }
79 84
80 // static 85 // static
(...skipping 20 matching lines...) Expand all
101 void MaterialDesignController::SetMode(Mode mode) { 106 void MaterialDesignController::SetMode(Mode mode) {
102 mode_ = mode; 107 mode_ = mode;
103 } 108 }
104 109
105 // static 110 // static
106 void MaterialDesignController::Uninitialize() { 111 void MaterialDesignController::Uninitialize() {
107 mode_ = Mode::UNINITIALIZED; 112 mode_ = Mode::UNINITIALIZED;
108 } 113 }
109 114
110 } // namespace ash 115 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698