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

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

Issue 10783015: Add ability to store hidpi theme images in data pack (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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_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 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 // theme properties out of the theme provider since it's cross platform. 161 // theme properties out of the theme provider since it's cross platform.
162 virtual const gfx::Image* GetImageNamed(int id) const; 162 virtual const gfx::Image* GetImageNamed(int id) const;
163 163
164 // Overridden from ui::ThemeProvider: 164 // Overridden from ui::ThemeProvider:
165 virtual SkBitmap* GetBitmapNamed(int id) const OVERRIDE; 165 virtual SkBitmap* GetBitmapNamed(int id) const OVERRIDE;
166 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE; 166 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE;
167 virtual SkColor GetColor(int id) const OVERRIDE; 167 virtual SkColor GetColor(int id) const OVERRIDE;
168 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE; 168 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE;
169 virtual bool ShouldUseNativeFrame() const OVERRIDE; 169 virtual bool ShouldUseNativeFrame() const OVERRIDE;
170 virtual bool HasCustomImage(int id) const OVERRIDE; 170 virtual bool HasCustomImage(int id) const OVERRIDE;
171 virtual base::RefCountedMemory* GetRawData(int id) const OVERRIDE; 171 virtual base::RefCountedMemory* GetRawData(
172 int id,
173 ui::ScaleFactor scale_factor) const OVERRIDE;
172 #if defined(OS_MACOSX) 174 #if defined(OS_MACOSX)
173 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE; 175 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE;
174 virtual NSColor* GetNSImageColorNamed(int id, 176 virtual NSColor* GetNSImageColorNamed(int id,
175 bool allow_default) const OVERRIDE; 177 bool allow_default) const OVERRIDE;
176 virtual NSColor* GetNSColor(int id, bool allow_default) const OVERRIDE; 178 virtual NSColor* GetNSColor(int id, bool allow_default) const OVERRIDE;
177 virtual NSColor* GetNSColorTint(int id, bool allow_default) const OVERRIDE; 179 virtual NSColor* GetNSColorTint(int id, bool allow_default) const OVERRIDE;
178 virtual NSGradient* GetNSGradient(int id) const OVERRIDE; 180 virtual NSGradient* GetNSGradient(int id) const OVERRIDE;
179 #elif defined(OS_POSIX) && !defined(TOOLKIT_VIEWS) && !defined(OS_ANDROID) 181 #elif defined(OS_POSIX) && !defined(TOOLKIT_VIEWS) && !defined(OS_ANDROID)
180 // This mismatch between what this class defines and whether or not it 182 // This mismatch between what this class defines and whether or not it
181 // overrides ui::ThemeProvider is http://crbug.com/105040 . 183 // overrides ui::ThemeProvider is http://crbug.com/105040 .
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 319
318 // The number of infobars currently displayed. 320 // The number of infobars currently displayed.
319 int number_of_infobars_; 321 int number_of_infobars_;
320 322
321 content::NotificationRegistrar registrar_; 323 content::NotificationRegistrar registrar_;
322 324
323 DISALLOW_COPY_AND_ASSIGN(ThemeService); 325 DISALLOW_COPY_AND_ASSIGN(ThemeService);
324 }; 326 };
325 327
326 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_ 328 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/themes/browser_theme_pack_unittest.cc ('k') | chrome/browser/themes/theme_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698