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: ui/base/resource/resource_bundle.h

Issue 9035010: Move frame color constants to CustomFrameView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 12 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 | ui/base/resource/resource_bundle.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) 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 UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ 5 #ifndef UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
6 #define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ 6 #define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 // Same as above, but returns a gfx::Image wrapping the GdkPixbuf. 183 // Same as above, but returns a gfx::Image wrapping the GdkPixbuf.
184 gfx::Image& GetRTLEnabledImageNamed(int resource_id); 184 gfx::Image& GetRTLEnabledImageNamed(int resource_id);
185 185
186 private: 186 private:
187 // Shared implementation for the above two functions. 187 // Shared implementation for the above two functions.
188 gfx::Image* GetPixbufImpl(int resource_id, bool rtl_enabled); 188 gfx::Image* GetPixbufImpl(int resource_id, bool rtl_enabled);
189 189
190 public: 190 public:
191 #endif 191 #endif
192 192
193 // TODO(glen): Move these into theme provider (dialogs still depend on
194 // ResourceBundle).
195 static const SkColor frame_color;
196 static const SkColor frame_color_inactive;
197
198 // TODO(beng): These browser-specific concepts should move to ThemeProvider. 193 // TODO(beng): These browser-specific concepts should move to ThemeProvider.
199 static const SkColor toolbar_color; 194 static const SkColor toolbar_color;
200 static const SkColor toolbar_separator_color; 195 static const SkColor toolbar_separator_color;
201 196
202 private: 197 private:
203 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LoadDataResourceBytes); 198 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LoadDataResourceBytes);
204 199
205 // Helper class for managing data packs. 200 // Helper class for managing data packs.
206 class LoadedDataPack { 201 class LoadedDataPack {
207 public: 202 public:
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 311
317 DISALLOW_COPY_AND_ASSIGN(ResourceBundle); 312 DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
318 }; 313 };
319 314
320 } // namespace ui 315 } // namespace ui
321 316
322 // TODO(beng): Someday, maybe, get rid of this. 317 // TODO(beng): Someday, maybe, get rid of this.
323 using ui::ResourceBundle; 318 using ui::ResourceBundle;
324 319
325 #endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ 320 #endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
OLDNEW
« no previous file with comments | « no previous file | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698