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

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

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename methods and vars to make image_scale more clear 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
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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 friend class ResourceBundleImageTest; 267 friend class ResourceBundleImageTest;
268 friend class ResourceBundleTest; 268 friend class ResourceBundleTest;
269 269
270 class ResourceBundleImageSource; 270 class ResourceBundleImageSource;
271 friend class ResourceBundleImageSource; 271 friend class ResourceBundleImageSource;
272 272
273 // Ctor/dtor are private, since we're a singleton. 273 // Ctor/dtor are private, since we're a singleton.
274 explicit ResourceBundle(Delegate* delegate); 274 explicit ResourceBundle(Delegate* delegate);
275 ~ResourceBundle(); 275 ~ResourceBundle();
276 276
277 // Shared initialization.
278 static void InitSharedInstance(Delegate* delegate);
279
277 // Free skia_images_. 280 // Free skia_images_.
278 void FreeImages(); 281 void FreeImages();
279 282
280 // Load the main resources. 283 // Load the main resources.
281 void LoadCommonResources(); 284 void LoadCommonResources();
282 285
283 // Implementation for AddDataPackFromPath and AddOptionalDataPackFromPath, if 286 // Implementation for AddDataPackFromPath and AddOptionalDataPackFromPath, if
284 // the pack is not |optional| logs an error on failure to load. 287 // the pack is not |optional| logs an error on failure to load.
285 void AddDataPackFromPathInternal(const base::FilePath& path, 288 void AddDataPackFromPathInternal(const base::FilePath& path,
286 ScaleFactor scale_factor, 289 ScaleFactor scale_factor,
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 396
394 DISALLOW_COPY_AND_ASSIGN(ResourceBundle); 397 DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
395 }; 398 };
396 399
397 } // namespace ui 400 } // namespace ui
398 401
399 // TODO(beng): Someday, maybe, get rid of this. 402 // TODO(beng): Someday, maybe, get rid of this.
400 using ui::ResourceBundle; 403 using ui::ResourceBundle;
401 404
402 #endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ 405 #endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698