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

Side by Side Diff: chrome/browser/themes/theme_service.h

Issue 10388064: Add GetImageSkiaNamed to resource_bundle and theme_provider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nits Created 8 years, 7 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 | « no previous file | chrome/browser/themes/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_THEMES_THEME_SERVICE_H_ 5 #ifndef CHROME_BROWSER_THEMES_THEME_SERVICE_H_
6 #define CHROME_BROWSER_THEMES_THEME_SERVICE_H_ 6 #define CHROME_BROWSER_THEMES_THEME_SERVICE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 virtual void Init(Profile* profile); 149 virtual void Init(Profile* profile);
150 150
151 // Returns a cross platform image for an id. 151 // Returns a cross platform image for an id.
152 // 152 //
153 // TODO(erg): Make this part of the ui::ThemeProvider and the main way to get 153 // TODO(erg): Make this part of the ui::ThemeProvider and the main way to get
154 // theme properties out of the theme provider since it's cross platform. 154 // theme properties out of the theme provider since it's cross platform.
155 virtual const gfx::Image* GetImageNamed(int id) const; 155 virtual const gfx::Image* GetImageNamed(int id) const;
156 156
157 // Overridden from ui::ThemeProvider: 157 // Overridden from ui::ThemeProvider:
158 virtual SkBitmap* GetBitmapNamed(int id) const OVERRIDE; 158 virtual SkBitmap* GetBitmapNamed(int id) const OVERRIDE;
159 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE;
159 virtual SkColor GetColor(int id) const OVERRIDE; 160 virtual SkColor GetColor(int id) const OVERRIDE;
160 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE; 161 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE;
161 virtual bool ShouldUseNativeFrame() const OVERRIDE; 162 virtual bool ShouldUseNativeFrame() const OVERRIDE;
162 virtual bool HasCustomImage(int id) const OVERRIDE; 163 virtual bool HasCustomImage(int id) const OVERRIDE;
163 virtual base::RefCountedMemory* GetRawData(int id) const OVERRIDE; 164 virtual base::RefCountedMemory* GetRawData(int id) const OVERRIDE;
164 #if defined(OS_MACOSX) 165 #if defined(OS_MACOSX)
165 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE; 166 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE;
166 virtual NSColor* GetNSImageColorNamed(int id, 167 virtual NSColor* GetNSImageColorNamed(int id,
167 bool allow_default) const OVERRIDE; 168 bool allow_default) const OVERRIDE;
168 virtual NSColor* GetNSColor(int id, bool allow_default) const OVERRIDE; 169 virtual NSColor* GetNSColor(int id, bool allow_default) const OVERRIDE;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 310
310 // The number of infobars currently displayed. 311 // The number of infobars currently displayed.
311 int number_of_infobars_; 312 int number_of_infobars_;
312 313
313 content::NotificationRegistrar registrar_; 314 content::NotificationRegistrar registrar_;
314 315
315 DISALLOW_COPY_AND_ASSIGN(ThemeService); 316 DISALLOW_COPY_AND_ASSIGN(ThemeService);
316 }; 317 };
317 318
318 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_ 319 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/themes/theme_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698