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

Side by Side Diff: ui/views/linux_ui/linux_ui.h

Issue 1878943002: Revert of Makes MaterialDesignController initialization explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « ui/views/controls/button/label_button_unittest.cc ('k') | ui/views/test/views_test_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef UI_VIEWS_LINUX_UI_LINUX_UI_H_ 5 #ifndef UI_VIEWS_LINUX_UI_LINUX_UI_H_
6 #define UI_VIEWS_LINUX_UI_LINUX_UI_H_ 6 #define UI_VIEWS_LINUX_UI_LINUX_UI_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 static void SetInstance(LinuxUI* instance); 73 static void SetInstance(LinuxUI* instance);
74 74
75 // Returns a LinuxUI instance for the toolkit used in the user's desktop 75 // Returns a LinuxUI instance for the toolkit used in the user's desktop
76 // environment. 76 // environment.
77 // 77 //
78 // Can return NULL, in case no toolkit has been set. (For example, if we're 78 // Can return NULL, in case no toolkit has been set. (For example, if we're
79 // running with the "--ash" flag.) 79 // running with the "--ash" flag.)
80 static LinuxUI* instance(); 80 static LinuxUI* instance();
81 81
82 virtual void Initialize() = 0; 82 virtual void Initialize() = 0;
83 // TODO(varkha): This should not be necessary once Material Design is on
84 // unconditionally.
85 virtual void MaterialDesignControllerReady() = 0;
86 83
87 // Returns a themed image per theme_provider.h 84 // Returns a themed image per theme_provider.h
88 virtual gfx::Image GetThemeImageNamed(int id) const = 0; 85 virtual gfx::Image GetThemeImageNamed(int id) const = 0;
89 virtual bool GetTint(int id, color_utils::HSL* tint) const = 0; 86 virtual bool GetTint(int id, color_utils::HSL* tint) const = 0;
90 virtual bool GetColor(int id, SkColor* color) const = 0; 87 virtual bool GetColor(int id, SkColor* color) const = 0;
91 virtual bool HasCustomImage(int id) const = 0; 88 virtual bool HasCustomImage(int id) const = 0;
92 89
93 // Returns the preferences that we pass to WebKit. 90 // Returns the preferences that we pass to WebKit.
94 virtual SkColor GetFocusRingColor() const = 0; 91 virtual SkColor GetFocusRingColor() const = 0;
95 virtual SkColor GetThumbActiveColor() const = 0; 92 virtual SkColor GetThumbActiveColor() const = 0;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 // recalculated. 160 // recalculated.
164 virtual void UpdateDeviceScaleFactor(float device_scale_factor) = 0; 161 virtual void UpdateDeviceScaleFactor(float device_scale_factor) = 0;
165 162
166 // Determines the device scale factor of the primary screen. 163 // Determines the device scale factor of the primary screen.
167 virtual float GetDeviceScaleFactor() const = 0; 164 virtual float GetDeviceScaleFactor() const = 0;
168 }; 165 };
169 166
170 } // namespace views 167 } // namespace views
171 168
172 #endif // UI_VIEWS_LINUX_UI_LINUX_UI_H_ 169 #endif // UI_VIEWS_LINUX_UI_LINUX_UI_H_
OLDNEW
« no previous file with comments | « ui/views/controls/button/label_button_unittest.cc ('k') | ui/views/test/views_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698