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

Unified Diff: ui/linux_ui/linux_ui.h

Issue 12315139: Sort out build dependencies for LinuxUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add comment Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/linux_ui.cc ('k') | ui/linux_ui/linux_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/linux_ui/linux_ui.h
diff --git a/ui/base/linux_ui.h b/ui/linux_ui/linux_ui.h
similarity index 71%
rename from ui/base/linux_ui.h
rename to ui/linux_ui/linux_ui.h
index 87b19b5faa2551d2adf5a8071dd8a50e6298bfe6..80f518f5683603ba21ae8637455624e808a1d70a 100644
--- a/ui/base/linux_ui.h
+++ b/ui/linux_ui/linux_ui.h
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_BASE_LINUX_UI_H_
-#define UI_BASE_LINUX_UI_H_
+#ifndef UI_LINUX_UI_LINUX_UI_H_
+#define UI_LINUX_UI_LINUX_UI_H_
-#include "ui/base/ui_export.h"
#include "third_party/skia/include/core/SkColor.h"
+#include "ui/linux_ui/linux_ui_export.h"
+#include "ui/shell_dialogs/linux_shell_dialog.h"
// The main entrypoint into Linux toolkit specific code. GTK code should only
// be executed behind this interface.
@@ -16,7 +17,7 @@ class Image;
}
namespace ui {
-class SelectFilePolicy;
+class NativeTheme;
// Adapter class with targets to render like different toolkits. Set by any
// project that wants to do linux desktop native rendering.
@@ -25,7 +26,10 @@ class SelectFilePolicy;
// minimum) GTK2 and GTK3. LinuxUI::instance() should actually be a very
// complex method that pokes around with dlopen against a libuigtk2.so, a
// liuigtk3.so, etc.
-class UI_EXPORT LinuxUI {
+//
+// TODO(erg): This class should be folded into ui/views/ instead of living in
+// its own component once we've deleted out the GTK+ port.
+class LINUX_UI_EXPORT LinuxUI : public LinuxShellDialog {
public:
virtual ~LinuxUI() {}
@@ -43,8 +47,12 @@ class UI_EXPORT LinuxUI {
virtual bool UseNativeTheme() const = 0;
virtual gfx::Image* GetThemeImageNamed(int id) const = 0;
virtual bool GetColor(int id, SkColor* color) const = 0;
+
+ // Returns a NativeTheme that will provide system colors and draw system
+ // style widgets.
+ virtual NativeTheme* GetNativeTheme() const = 0;
};
} // namespace ui
-#endif // UI_BASE_LINUX_UI_H_
+#endif // UI_LINUX_UI_LINUX_UI_H_
« no previous file with comments | « ui/base/linux_ui.cc ('k') | ui/linux_ui/linux_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698