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

Side by Side Diff: chrome/browser/ui/libgtk2ui/gtk2_ui.h

Issue 12230026: linux: Both gtk and the aura port should set the icon theme name. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes for thestig 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/gtk/gtk_theme_service.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_ 5 #ifndef CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
6 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_ 6 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 typedef std::map<int, color_utils::HSL> TintMap; 48 typedef std::map<int, color_utils::HSL> TintMap;
49 typedef std::map<int, gfx::Image*> ImageCache; 49 typedef std::map<int, gfx::Image*> ImageCache;
50 50
51 // This method returns the colors webkit will use for the scrollbars. When no 51 // This method returns the colors webkit will use for the scrollbars. When no
52 // colors are specified by the GTK+ theme, this function averages of the 52 // colors are specified by the GTK+ theme, this function averages of the
53 // thumb part and of the track colors. 53 // thumb part and of the track colors.
54 void GetScrollbarColors(GdkColor* thumb_active_color, 54 void GetScrollbarColors(GdkColor* thumb_active_color,
55 GdkColor* thumb_inactive_color, 55 GdkColor* thumb_inactive_color,
56 GdkColor* track_color); 56 GdkColor* track_color);
57 57
58 // Gets the name of the current icon theme and passes it to our low level XDG
59 // integration.
60 void SetXDGIconTheme();
61
58 // Extracts colors and tints from the GTK theme, both for the 62 // Extracts colors and tints from the GTK theme, both for the
59 // ThemeService interface and the colors we send to webkit. 63 // ThemeService interface and the colors we send to webkit.
60 void LoadGtkValues(); 64 void LoadGtkValues();
61 65
62 // Reads in explicit theme frame colors from the ChromeGtkFrame style class 66 // Reads in explicit theme frame colors from the ChromeGtkFrame style class
63 // or generates them per our fallback algorithm. 67 // or generates them per our fallback algorithm.
64 GdkColor BuildFrameColors(GtkStyle* frame_style); 68 GdkColor BuildFrameColors(GtkStyle* frame_style);
65 69
66 // Sets the underlying theme colors/tints from a GTK color. 70 // Sets the underlying theme colors/tints from a GTK color.
67 void SetThemeColorFromGtk(int id, const GdkColor* color); 71 void SetThemeColorFromGtk(int id, const GdkColor* color);
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 } // namespace libgtk2ui 156 } // namespace libgtk2ui
153 157
154 // Access point to the GTK2 desktop system. This should be the only symbol that 158 // Access point to the GTK2 desktop system. This should be the only symbol that
155 // is exported in the library; everything else should be used through the 159 // is exported in the library; everything else should be used through the
156 // interface, because eventually this .so will be loaded through dlopen at 160 // interface, because eventually this .so will be loaded through dlopen at
157 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or 161 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or
158 // QT or whatever. 162 // QT or whatever.
159 LIBGTK2UI_EXPORT ui::LinuxUI* BuildGtk2UI(); 163 LIBGTK2UI_EXPORT ui::LinuxUI* BuildGtk2UI();
160 164
161 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_ 165 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/gtk_theme_service.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698