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

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

Issue 9460039: ui/base: Remove the dependency in Profile from ThemeProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm » ('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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 }; 138 };
139 139
140 // Background tiling choices. 140 // Background tiling choices.
141 enum Tiling { 141 enum Tiling {
142 NO_REPEAT = 0, 142 NO_REPEAT = 0,
143 REPEAT_X = 1, 143 REPEAT_X = 1,
144 REPEAT_Y = 2, 144 REPEAT_Y = 2,
145 REPEAT = 3 145 REPEAT = 3
146 }; 146 };
147 147
148 virtual void Init(Profile* profile);
149
148 // Returns a cross platform image for an id. 150 // Returns a cross platform image for an id.
149 // 151 //
150 // TODO(erg): Make this part of the ui::ThemeProvider and the main way to get 152 // TODO(erg): Make this part of the ui::ThemeProvider and the main way to get
151 // theme properties out of the theme provider since it's cross platform. 153 // theme properties out of the theme provider since it's cross platform.
152 virtual const gfx::Image* GetImageNamed(int id) const; 154 virtual const gfx::Image* GetImageNamed(int id) const;
153 155
154 // ui::ThemeProvider implementation. 156 // Overridden from ui::ThemeProvider:
155 virtual void Init(Profile* profile) OVERRIDE;
156 virtual SkBitmap* GetBitmapNamed(int id) const OVERRIDE; 157 virtual SkBitmap* GetBitmapNamed(int id) const OVERRIDE;
157 virtual SkColor GetColor(int id) const OVERRIDE; 158 virtual SkColor GetColor(int id) const OVERRIDE;
158 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE; 159 virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE;
159 virtual bool ShouldUseNativeFrame() const OVERRIDE; 160 virtual bool ShouldUseNativeFrame() const OVERRIDE;
160 virtual bool HasCustomImage(int id) const OVERRIDE; 161 virtual bool HasCustomImage(int id) const OVERRIDE;
161 virtual RefCountedMemory* GetRawData(int id) const OVERRIDE; 162 virtual RefCountedMemory* GetRawData(int id) const OVERRIDE;
162 #if defined(OS_MACOSX) 163 #if defined(OS_MACOSX)
163 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE; 164 virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE;
164 virtual NSColor* GetNSImageColorNamed(int id, 165 virtual NSColor* GetNSImageColorNamed(int id,
165 bool allow_default) const OVERRIDE; 166 bool allow_default) const OVERRIDE;
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 312
312 // The number of infobars currently displayed. 313 // The number of infobars currently displayed.
313 int number_of_infobars_; 314 int number_of_infobars_;
314 315
315 content::NotificationRegistrar registrar_; 316 content::NotificationRegistrar registrar_;
316 317
317 DISALLOW_COPY_AND_ASSIGN(ThemeService); 318 DISALLOW_COPY_AND_ASSIGN(ThemeService);
318 }; 319 };
319 320
320 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_ 321 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698