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

Unified Diff: chrome/browser/ui/libgtkui/native_theme_gtk2.h

Issue 2579683002: LibGtkUi: Partition NativeThemeGtk into NativeThemeGtk2 and NativeThemeGtk3 (Closed)
Patch Set: Fix lsan error Created 4 years 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 | « chrome/browser/ui/libgtkui/native_theme_gtk.cc ('k') | chrome/browser/ui/libgtkui/native_theme_gtk2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtkui/native_theme_gtk2.h
diff --git a/chrome/browser/ui/libgtkui/native_theme_gtk.h b/chrome/browser/ui/libgtkui/native_theme_gtk2.h
similarity index 78%
rename from chrome/browser/ui/libgtkui/native_theme_gtk.h
rename to chrome/browser/ui/libgtkui/native_theme_gtk2.h
index 18747ec7ce38d1d91ac34262bd1bc66f8774a40a..b3dda4888fb9ad12125801322b3a2414c7afd02e 100644
--- a/chrome/browser/ui/libgtkui/native_theme_gtk.h
+++ b/chrome/browser/ui/libgtkui/native_theme_gtk2.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_LIBGTKUI_NATIVE_THEME_GTK_H_
-#define CHROME_BROWSER_UI_LIBGTKUI_NATIVE_THEME_GTK_H_
-
-#include <gtk/gtk.h>
+#ifndef CHROME_BROWSER_UI_LIBGTKUI_NATIVE_THEME_GTK2_H_
+#define CHROME_BROWSER_UI_LIBGTKUI_NATIVE_THEME_GTK2_H_
#include "base/macros.h"
#include "ui/native_theme/native_theme_base.h"
+typedef struct _GtkWidget GtkWidget;
+
namespace libgtkui {
// A version of NativeTheme that uses GTK2 supplied colours instead of the
@@ -31,10 +31,9 @@ class NativeThemeGtk2 : public ui::NativeThemeBase {
const gfx::Rect& rect,
const MenuItemExtraParams& menu_item) const override;
- // Gets a ChromeGtkFrame theme color; returns true on success. Always returns
- // false in GTK3.
- bool GetChromeStyleColor(const char* style_property,
- SkColor* ret_color) const;
+ private:
+ NativeThemeGtk2();
+ ~NativeThemeGtk2() override;
// Returns various widgets for theming use.
GtkWidget* GetWindow() const;
@@ -47,13 +46,9 @@ class NativeThemeGtk2 : public ui::NativeThemeBase {
GtkWidget* GetMenu() const;
GtkWidget* GetMenuItem() const;
- private:
- NativeThemeGtk2();
- ~NativeThemeGtk2() override;
-
DISALLOW_COPY_AND_ASSIGN(NativeThemeGtk2);
};
} // namespace libgtkui
-#endif // CHROME_BROWSER_UI_LIBGTKUI_NATIVE_THEME_GTK_H_
+#endif // CHROME_BROWSER_UI_LIBGTKUI_NATIVE_THEME_GTK2_H_
« no previous file with comments | « chrome/browser/ui/libgtkui/native_theme_gtk.cc ('k') | chrome/browser/ui/libgtkui/native_theme_gtk2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698