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

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

Issue 10272004: Move RefCountedMemory class to base namespace. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: 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 | « chrome/browser/themes/browser_theme_pack.cc ('k') | 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 SkColor GetColor(int id) const OVERRIDE; 159 virtual SkColor GetColor(int id) const OVERRIDE;
160 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE; 160 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE;
161 virtual bool ShouldUseNativeFrame() const OVERRIDE; 161 virtual bool ShouldUseNativeFrame() const OVERRIDE;
162 virtual bool HasCustomImage(int id) const OVERRIDE; 162 virtual bool HasCustomImage(int id) const OVERRIDE;
163 virtual RefCountedMemory* GetRawData(int id) const OVERRIDE; 163 virtual base::RefCountedMemory* GetRawData(int id) const OVERRIDE;
164 #if defined(OS_MACOSX) 164 #if defined(OS_MACOSX)
165 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE; 165 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE;
166 virtual NSColor* GetNSImageColorNamed(int id, 166 virtual NSColor* GetNSImageColorNamed(int id,
167 bool allow_default) const OVERRIDE; 167 bool allow_default) const OVERRIDE;
168 virtual NSColor* GetNSColor(int id, bool allow_default) const OVERRIDE; 168 virtual NSColor* GetNSColor(int id, bool allow_default) const OVERRIDE;
169 virtual NSColor* GetNSColorTint(int id, bool allow_default) const OVERRIDE; 169 virtual NSColor* GetNSColorTint(int id, bool allow_default) const OVERRIDE;
170 virtual NSGradient* GetNSGradient(int id) const OVERRIDE; 170 virtual NSGradient* GetNSGradient(int id) const OVERRIDE;
171 #elif defined(OS_POSIX) && !defined(TOOLKIT_VIEWS) && !defined(OS_ANDROID) 171 #elif defined(OS_POSIX) && !defined(TOOLKIT_VIEWS) && !defined(OS_ANDROID)
172 // This mismatch between what this class defines and whether or not it 172 // This mismatch between what this class defines and whether or not it
173 // overrides ui::ThemeProvider is http://crbug.com/105040 . 173 // overrides ui::ThemeProvider is http://crbug.com/105040 .
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 309
310 // The number of infobars currently displayed. 310 // The number of infobars currently displayed.
311 int number_of_infobars_; 311 int number_of_infobars_;
312 312
313 content::NotificationRegistrar registrar_; 313 content::NotificationRegistrar registrar_;
314 314
315 DISALLOW_COPY_AND_ASSIGN(ThemeService); 315 DISALLOW_COPY_AND_ASSIGN(ThemeService);
316 }; 316 };
317 317
318 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_ 318 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/themes/browser_theme_pack.cc ('k') | chrome/browser/themes/theme_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698