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

Side by Side Diff: chrome/browser/ui/gtk/gtk_theme_service.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/icon_loader.cc ('k') | chrome/browser/ui/gtk/gtk_theme_service.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_GTK_GTK_THEME_SERVICE_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_
6 #define CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_ 6 #define CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 // Load theme data from preferences, possibly picking colors from GTK. 164 // Load theme data from preferences, possibly picking colors from GTK.
165 virtual void LoadThemePrefs() OVERRIDE; 165 virtual void LoadThemePrefs() OVERRIDE;
166 166
167 // Let all the browser views know that themes have changed. 167 // Let all the browser views know that themes have changed.
168 virtual void NotifyThemeChanged() OVERRIDE; 168 virtual void NotifyThemeChanged() OVERRIDE;
169 169
170 // Additionally frees the CairoCachedSurfaces. 170 // Additionally frees the CairoCachedSurfaces.
171 virtual void FreePlatformCaches() OVERRIDE; 171 virtual void FreePlatformCaches() OVERRIDE;
172 172
173 // Gets the name of the current icon theme and passes it to our low level XDG
174 // integration.
175 void SetXDGIconTheme();
176
173 // Extracts colors and tints from the GTK theme, both for the 177 // Extracts colors and tints from the GTK theme, both for the
174 // ThemeService interface and the colors we send to webkit. 178 // ThemeService interface and the colors we send to webkit.
175 void LoadGtkValues(); 179 void LoadGtkValues();
176 180
177 // Reads in explicit theme frame colors from the ChromeGtkFrame style class 181 // Reads in explicit theme frame colors from the ChromeGtkFrame style class
178 // or generates them per our fallback algorithm. 182 // or generates them per our fallback algorithm.
179 GdkColor BuildFrameColors(GtkStyle* frame_style); 183 GdkColor BuildFrameColors(GtkStyle* frame_style);
180 184
181 // Sets the values that we send to webkit to safe defaults. 185 // Sets the values that we send to webkit to safe defaults.
182 void LoadDefaultValues(); 186 void LoadDefaultValues();
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 309
306 // The default folder icon and default bookmark icon for the GTK theme. 310 // The default folder icon and default bookmark icon for the GTK theme.
307 // These are static because the system can only have one theme at a time. 311 // These are static because the system can only have one theme at a time.
308 // They are cached when they are requested the first time, and cleared when 312 // They are cached when they are requested the first time, and cleared when
309 // the system theme changes. 313 // the system theme changes.
310 static base::LazyInstance<gfx::Image> default_folder_icon_; 314 static base::LazyInstance<gfx::Image> default_folder_icon_;
311 static base::LazyInstance<gfx::Image> default_bookmark_icon_; 315 static base::LazyInstance<gfx::Image> default_bookmark_icon_;
312 }; 316 };
313 317
314 #endif // CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_ 318 #endif // CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/icon_loader.cc ('k') | chrome/browser/ui/gtk/gtk_theme_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698