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

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

Issue 23614007: Use the normal Google logo for managed users for --enable-instant-extended-api (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed mac compile failure Created 7 years, 3 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/theme_properties.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 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 71
72 // Returns a cross platform image for an id. 72 // Returns a cross platform image for an id.
73 // 73 //
74 // TODO(erg): Make this part of the ui::ThemeProvider and the main way to get 74 // TODO(erg): Make this part of the ui::ThemeProvider and the main way to get
75 // theme properties out of the theme provider since it's cross platform. 75 // theme properties out of the theme provider since it's cross platform.
76 virtual gfx::Image GetImageNamed(int id) const; 76 virtual gfx::Image GetImageNamed(int id) const;
77 77
78 // Overridden from ui::ThemeProvider: 78 // Overridden from ui::ThemeProvider:
79 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE; 79 virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE;
80 virtual SkColor GetColor(int id) const OVERRIDE; 80 virtual SkColor GetColor(int id) const OVERRIDE;
81 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE; 81 virtual int GetDisplayProperty(int id) const OVERRIDE;
82 virtual bool ShouldUseNativeFrame() const OVERRIDE; 82 virtual bool ShouldUseNativeFrame() const OVERRIDE;
83 virtual bool HasCustomImage(int id) const OVERRIDE; 83 virtual bool HasCustomImage(int id) const OVERRIDE;
84 virtual base::RefCountedMemory* GetRawData( 84 virtual base::RefCountedMemory* GetRawData(
85 int id, 85 int id,
86 ui::ScaleFactor scale_factor) const OVERRIDE; 86 ui::ScaleFactor scale_factor) const OVERRIDE;
87 #if defined(OS_MACOSX) 87 #if defined(OS_MACOSX)
88 virtual NSImage* GetNSImageNamed(int id) const OVERRIDE; 88 virtual NSImage* GetNSImageNamed(int id) const OVERRIDE;
89 virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE; 89 virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE;
90 virtual NSColor* GetNSColor(int id) const OVERRIDE; 90 virtual NSColor* GetNSColor(int id) const OVERRIDE;
91 virtual NSColor* GetNSColorTint(int id) const OVERRIDE; 91 virtual NSColor* GetNSColorTint(int id) const OVERRIDE;
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 content::NotificationRegistrar registrar_; 262 content::NotificationRegistrar registrar_;
263 263
264 scoped_ptr<ThemeSyncableService> theme_syncable_service_; 264 scoped_ptr<ThemeSyncableService> theme_syncable_service_;
265 265
266 base::WeakPtrFactory<ThemeService> weak_ptr_factory_; 266 base::WeakPtrFactory<ThemeService> weak_ptr_factory_;
267 267
268 DISALLOW_COPY_AND_ASSIGN(ThemeService); 268 DISALLOW_COPY_AND_ASSIGN(ThemeService);
269 }; 269 };
270 270
271 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_ 271 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_properties.cc ('k') | chrome/browser/themes/theme_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698