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

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

Issue 10928231: Fix ResourceBundleImageSource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 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 | « 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) 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 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 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #include <map> 10 #include <map>
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetPathForLocalePack); 240 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetPathForLocalePack);
241 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetImageNamed); 241 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetImageNamed);
242 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetNativeImageNamed); 242 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetNativeImageNamed);
243 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateLoadDataResourceBytes); 243 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateLoadDataResourceBytes);
244 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetRawDataResource); 244 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetRawDataResource);
245 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetLocalizedString); 245 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetLocalizedString);
246 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetFont); 246 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, DelegateGetFont);
247 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, GetRawDataResource); 247 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, GetRawDataResource);
248 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LoadDataResourceBytes); 248 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LoadDataResourceBytes);
249 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LocaleDataPakExists); 249 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, LocaleDataPakExists);
250 FRIEND_TEST_ALL_PREFIXES(ResourceBundle, GetImageNamed);
250 251
251 class ResourceBundleImageSource; 252 class ResourceBundleImageSource;
252 friend class ResourceBundleImageSource; 253 friend class ResourceBundleImageSource;
253 254
254 // Ctor/dtor are private, since we're a singleton. 255 // Ctor/dtor are private, since we're a singleton.
255 explicit ResourceBundle(Delegate* delegate); 256 explicit ResourceBundle(Delegate* delegate);
256 ~ResourceBundle(); 257 ~ResourceBundle();
257 258
258 // Free skia_images_. 259 // Free skia_images_.
259 void FreeImages(); 260 void FreeImages();
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 333
333 DISALLOW_COPY_AND_ASSIGN(ResourceBundle); 334 DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
334 }; 335 };
335 336
336 } // namespace ui 337 } // namespace ui
337 338
338 // TODO(beng): Someday, maybe, get rid of this. 339 // TODO(beng): Someday, maybe, get rid of this.
339 using ui::ResourceBundle; 340 using ui::ResourceBundle;
340 341
341 #endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ 342 #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