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

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

Issue 19471005: Add custom default theme support and create a managed user default theme. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments and add tests. Created 7 years, 5 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
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // Overridden from ThemeService: 68 // Overridden from ThemeService:
69 // 69 //
70 // Sets that we aren't using the system theme, then calls 70 // Sets that we aren't using the system theme, then calls
71 // ThemeService's implementation. 71 // ThemeService's implementation.
72 virtual void Init(Profile* profile) OVERRIDE; 72 virtual void Init(Profile* profile) OVERRIDE;
73 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE; 73 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE;
74 virtual gfx::Image GetImageNamed(int id) const OVERRIDE; 74 virtual gfx::Image GetImageNamed(int id) const OVERRIDE;
75 virtual SkColor GetColor(int id) const OVERRIDE; 75 virtual SkColor GetColor(int id) const OVERRIDE;
76 virtual bool HasCustomImage(int id) const OVERRIDE; 76 virtual bool HasCustomImage(int id) const OVERRIDE;
77 virtual void SetTheme(const extensions::Extension* extension) OVERRIDE; 77 virtual void SetTheme(const extensions::Extension* extension) OVERRIDE;
78 virtual bool ShouldInitWithNativeTheme() OVERRIDE;
pkotwicz 2013/07/22 20:17:28 The new method should be right below UsingNativeTh
Adrian Kuegel 2013/07/23 08:13:29 Done.
78 virtual void UseDefaultTheme() OVERRIDE; 79 virtual void UseDefaultTheme() OVERRIDE;
79 virtual void SetNativeTheme() OVERRIDE; 80 virtual void SetNativeTheme() OVERRIDE;
80 virtual bool UsingDefaultTheme() const OVERRIDE; 81 virtual bool UsingDefaultTheme() const OVERRIDE;
81 virtual bool UsingNativeTheme() const OVERRIDE; 82 virtual bool UsingNativeTheme() const OVERRIDE;
82 83
83 // Creates a GtkChromeButton instance, registered with this theme provider, 84 // Creates a GtkChromeButton instance, registered with this theme provider,
84 // with a "destroy" signal to remove it from our internal list when it goes 85 // with a "destroy" signal to remove it from our internal list when it goes
85 // away. 86 // away.
86 GtkWidget* BuildChromeButton(); 87 GtkWidget* BuildChromeButton();
87 88
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 310
310 // The default folder icon and default bookmark icon for the GTK theme. 311 // The default folder icon and default bookmark icon for the GTK theme.
311 // These are static because the system can only have one theme at a time. 312 // These are static because the system can only have one theme at a time.
312 // They are cached when they are requested the first time, and cleared when 313 // They are cached when they are requested the first time, and cleared when
313 // the system theme changes. 314 // the system theme changes.
314 static base::LazyInstance<gfx::Image> default_folder_icon_; 315 static base::LazyInstance<gfx::Image> default_folder_icon_;
315 static base::LazyInstance<gfx::Image> default_bookmark_icon_; 316 static base::LazyInstance<gfx::Image> default_bookmark_icon_;
316 }; 317 };
317 318
318 #endif // CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_ 319 #endif // CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698