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

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

Issue 8527029: Un-annotate OVERRIDE where it wasn't. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 virtual void Init(Profile* profile) OVERRIDE; 143 virtual void Init(Profile* profile) OVERRIDE;
144 virtual SkBitmap* GetBitmapNamed(int id) const OVERRIDE; 144 virtual SkBitmap* GetBitmapNamed(int id) const OVERRIDE;
145 virtual SkColor GetColor(int id) const OVERRIDE; 145 virtual SkColor GetColor(int id) const OVERRIDE;
146 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE; 146 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE;
147 virtual bool ShouldUseNativeFrame() const OVERRIDE; 147 virtual bool ShouldUseNativeFrame() const OVERRIDE;
148 virtual bool HasCustomImage(int id) const OVERRIDE; 148 virtual bool HasCustomImage(int id) const OVERRIDE;
149 virtual RefCountedMemory* GetRawData(int id) const OVERRIDE; 149 virtual RefCountedMemory* GetRawData(int id) const OVERRIDE;
150 #if defined(TOOLKIT_USES_GTK) 150 #if defined(TOOLKIT_USES_GTK)
151 // GdkPixbufs returned by GetPixbufNamed and GetRTLEnabledPixbufNamed are 151 // GdkPixbufs returned by GetPixbufNamed and GetRTLEnabledPixbufNamed are
152 // shared instances owned by the theme provider and should not be freed. 152 // shared instances owned by the theme provider and should not be freed.
153 virtual GdkPixbuf* GetPixbufNamed(int id) const OVERRIDE; 153 virtual GdkPixbuf* GetPixbufNamed(int id) const;
154 virtual GdkPixbuf* GetRTLEnabledPixbufNamed(int id) const OVERRIDE; 154 virtual GdkPixbuf* GetRTLEnabledPixbufNamed(int id) const;
155 #elif defined(OS_MACOSX) 155 #elif defined(OS_MACOSX)
156 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE; 156 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE;
157 virtual NSColor* GetNSImageColorNamed(int id, 157 virtual NSColor* GetNSImageColorNamed(int id,
158 bool allow_default) const OVERRIDE; 158 bool allow_default) const OVERRIDE;
159 virtual NSColor* GetNSColor(int id, bool allow_default) const OVERRIDE; 159 virtual NSColor* GetNSColor(int id, bool allow_default) const OVERRIDE;
160 virtual NSColor* GetNSColorTint(int id, bool allow_default) const OVERRIDE; 160 virtual NSColor* GetNSColorTint(int id, bool allow_default) const OVERRIDE;
161 virtual NSGradient* GetNSGradient(int id) const OVERRIDE; 161 virtual NSGradient* GetNSGradient(int id) const OVERRIDE;
162 #endif 162 #endif
163 163
164 // Set the current theme to the theme defined in |extension|. 164 // Set the current theme to the theme defined in |extension|.
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 294
295 // The number of infobars currently displayed. 295 // The number of infobars currently displayed.
296 int number_of_infobars_; 296 int number_of_infobars_;
297 297
298 content::NotificationRegistrar registrar_; 298 content::NotificationRegistrar registrar_;
299 299
300 DISALLOW_COPY_AND_ASSIGN(ThemeService); 300 DISALLOW_COPY_AND_ASSIGN(ThemeService);
301 }; 301 };
302 302
303 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_ 303 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698