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

Side by Side Diff: chrome/browser/ui/gtk/gtk_theme_service.h

Issue 11445038: Revert changes to have ExtensionService notify ThemeService directly for themes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error Created 8 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 unified diff | Download patch | Annotate | Revision Log
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
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/prefs/public/pref_change_registrar.h" 14 #include "base/prefs/public/pref_change_registrar.h"
15 #include "chrome/browser/themes/theme_service.h" 15 #include "chrome/browser/themes/theme_service.h"
16 #include "ui/base/glib/glib_integers.h" 16 #include "ui/base/glib/glib_integers.h"
17 #include "ui/base/gtk/gtk_signal.h" 17 #include "ui/base/gtk/gtk_signal.h"
18 #include "ui/base/gtk/owned_widget_gtk.h" 18 #include "ui/base/gtk/owned_widget_gtk.h"
19 #include "ui/gfx/color_utils.h" 19 #include "ui/gfx/color_utils.h"
20 20
21 class Profile; 21 class Profile;
22 22
23 namespace content {
24 class NotificationObserver;
25 }
26
27 namespace extensions { 23 namespace extensions {
28 class Extension; 24 class Extension;
29 } 25 }
30 26
31 namespace gfx { 27 namespace gfx {
32 class CairoCachedSurface; 28 class CairoCachedSurface;
33 } 29 }
34 30
35 namespace ui { 31 namespace ui {
36 class GtkSignalRegistrar; 32 class GtkSignalRegistrar;
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 301
306 // The default folder icon and default bookmark icon for the GTK theme. 302 // 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. 303 // 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 304 // They are cached when they are requested the first time, and cleared when
309 // the system theme changes. 305 // the system theme changes.
310 static base::LazyInstance<gfx::Image> default_folder_icon_; 306 static base::LazyInstance<gfx::Image> default_folder_icon_;
311 static base::LazyInstance<gfx::Image> default_bookmark_icon_; 307 static base::LazyInstance<gfx::Image> default_bookmark_icon_;
312 }; 308 };
313 309
314 #endif // CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_ 310 #endif // CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_service_unittest.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