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

Side by Side Diff: ui/base/resource/resource_bundle.h

Issue 8574033: Beginnings of Window Modality support. (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 | « ui/aura_shell/workspace_controller.cc ('k') | 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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 // Shared implementation for the above two functions. 182 // Shared implementation for the above two functions.
183 gfx::Image* GetPixbufImpl(int resource_id, bool rtl_enabled); 183 gfx::Image* GetPixbufImpl(int resource_id, bool rtl_enabled);
184 184
185 public: 185 public:
186 #endif 186 #endif
187 187
188 // TODO(glen): Move these into theme provider (dialogs still depend on 188 // TODO(glen): Move these into theme provider (dialogs still depend on
189 // ResourceBundle). 189 // ResourceBundle).
190 static const SkColor frame_color; 190 static const SkColor frame_color;
191 static const SkColor frame_color_inactive; 191 static const SkColor frame_color_inactive;
192
193 // TODO(beng): These browser-specific concepts should move to ThemeProvider.
192 static const SkColor frame_color_app_panel; 194 static const SkColor frame_color_app_panel;
193 static const SkColor frame_color_app_panel_inactive; 195 static const SkColor frame_color_app_panel_inactive;
194 static const SkColor frame_color_incognito; 196 static const SkColor frame_color_incognito;
195 static const SkColor frame_color_incognito_inactive; 197 static const SkColor frame_color_incognito_inactive;
196 static const SkColor toolbar_color; 198 static const SkColor toolbar_color;
197 static const SkColor toolbar_separator_color; 199 static const SkColor toolbar_separator_color;
198 200
199 private: 201 private:
200 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LoadDataResourceBytes); 202 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LoadDataResourceBytes);
201 203
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 315
314 DISALLOW_COPY_AND_ASSIGN(ResourceBundle); 316 DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
315 }; 317 };
316 318
317 } // namespace ui 319 } // namespace ui
318 320
319 // TODO(beng): Someday, maybe, get rid of this. 321 // TODO(beng): Someday, maybe, get rid of this.
320 using ui::ResourceBundle; 322 using ui::ResourceBundle;
321 323
322 #endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ 324 #endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
OLDNEW
« no previous file with comments | « ui/aura_shell/workspace_controller.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698