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

Unified Diff: ui/views/linux_ui/linux_ui.h

Issue 243633003: use the right NativeTheme on bubbles + dialogs on Aura Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rejigger Created 6 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 side-by-side diff with in-line comments
Download patch
Index: ui/views/linux_ui/linux_ui.h
diff --git a/ui/views/linux_ui/linux_ui.h b/ui/views/linux_ui/linux_ui.h
index cadc7b72632b51f0806acff2cb51c3e7621dd637..de9a566124b360735f44b6d52d3063e6f0627bb3 100644
--- a/ui/views/linux_ui/linux_ui.h
+++ b/ui/views/linux_ui/linux_ui.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/callback.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/ime/linux/linux_input_method_context_factory.h"
#include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
@@ -19,6 +20,10 @@
// The main entrypoint into Linux toolkit specific code. GTK code should only
// be executed behind this interface.
+namespace aura {
+class Window;
+}
+
namespace gfx {
class Image;
}
@@ -55,6 +60,9 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory,
MIDDLE_CLICK_ACTION_TOGGLE_MAXIMIZE
};
+ typedef base::Callback<ui::NativeTheme*(aura::Window* window)>
+ NativeThemeGetter;
+
virtual ~LinuxUI() {}
// Sets the dynamically loaded singleton that draws the desktop native UI.
@@ -87,7 +95,10 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory,
// Returns a NativeTheme that will provide system colors and draw system
// style widgets.
- virtual ui::NativeTheme* GetNativeTheme() const = 0;
+ virtual ui::NativeTheme* GetNativeTheme(aura::Window* window) const = 0;
+
+ // Used to set an override NativeTheme.
+ virtual void SetNativeThemeOverride(const NativeThemeGetter& callback) = 0;
// Returns whether we should be using the native theme provided by this
// object by default.
« no previous file with comments | « ui/views/controls/menu/menu_scroll_view_container.cc ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698