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

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

Issue 2783433002: Gtk3: Use menubar instead of headerbar on version less than 3.10 (Closed)
Patch Set: Remove bogus line Created 3 years, 9 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 | « chrome/browser/ui/libgtkui/gtk_ui.cc ('k') | chrome/browser/ui/libgtkui/gtk_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtkui/gtk_util.h
diff --git a/chrome/browser/ui/libgtkui/gtk_util.h b/chrome/browser/ui/libgtkui/gtk_util.h
index 91fc0ce24fbe22e214e726470790819d6a57df47..583e0e4ec7e70f15d30bee3d004dd17dab31ff0d 100644
--- a/chrome/browser/ui/libgtkui/gtk_util.h
+++ b/chrome/browser/ui/libgtkui/gtk_util.h
@@ -195,17 +195,17 @@ ScopedStyleContext AppendCssNodeToStyleContext(GtkStyleContext* context,
// of '.'-prefixed classes and ':'-prefixed pseudoclasses. An example
// is "GtkButton.button.suggested-action:hover:active". The caller
// must g_object_unref() the returned context.
-ScopedStyleContext GetStyleContextFromCss(const char* css_selector);
+ScopedStyleContext GetStyleContextFromCss(const std::string& css_selector);
SkColor GetFgColorFromStyleContext(GtkStyleContext* context);
// Overrides properties on |context| and all its parents with those
// provided by |css|.
-void ApplyCssToContext(GtkStyleContext* context, const char* css);
+void ApplyCssToContext(GtkStyleContext* context, const std::string& css);
// Get the 'color' property from the style context created by
// GetStyleContextFromCss(|css_selector|).
-SkColor GetFgColor(const char* css_selector);
+SkColor GetFgColor(const std::string& css_selector);
// Renders the backgrounds of all ancestors of |context|, then renders
// the background for |context| itself.
@@ -216,19 +216,19 @@ void RenderBackground(const gfx::Size& size,
// Renders a background from the style context created by
// GetStyleContextFromCss(|css_selector|) into a 24x24 bitmap and
// returns the average color.
-SkColor GetBgColor(const char* css_selector);
+SkColor GetBgColor(const std::string& css_selector);
// Renders the border from the style context created by
// GetStyleContextFromCss(|css_selector|) into a 24x24 bitmap and
// returns the average color.
-SkColor GetBorderColor(const char* css_selector);
+SkColor GetBorderColor(const std::string& css_selector);
// On Gtk3.20 or later, behaves like GetBgColor. Otherwise, returns
// the background-color property.
-SkColor GetSelectionBgColor(const char* css_selector);
+SkColor GetSelectionBgColor(const std::string& css_selector);
// Get the color of the GtkSeparator specified by |css_selector|.
-SkColor GetSeparatorColor(const char* css_selector);
+SkColor GetSeparatorColor(const std::string& css_selector);
#endif
} // namespace libgtkui
« no previous file with comments | « chrome/browser/ui/libgtkui/gtk_ui.cc ('k') | chrome/browser/ui/libgtkui/gtk_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698