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

Unified 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: Fix new usage of scale in FastShowPickler 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/layout_unittest.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.h
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index f9a34df3f1be4584ed11c820dc94e69152d219d2..bea12c19a25d65067a9989d43293a58a34d64bf9 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -255,9 +255,7 @@ class UI_EXPORT ResourceBundle {
// Returns the maximum scale factor currently loaded.
// Returns SCALE_FACTOR_100P if no resource is loaded.
- ScaleFactor max_scale_factor() const {
- return max_scale_factor_;
- }
+ ScaleFactor GetMaxScaleFactor() const;
private:
FRIEND_TEST_ALL_PREFIXES(ResourceBundleTest, DelegateGetPathForLocalePack);
@@ -274,6 +272,9 @@ class UI_EXPORT ResourceBundle {
explicit ResourceBundle(Delegate* delegate);
~ResourceBundle();
+ // Shared initialization.
+ static void InitSharedInstance(Delegate* delegate);
+
// Free skia_images_.
void FreeImages();
« no previous file with comments | « ui/base/layout_unittest.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698