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

Side by Side Diff: ui/base/resource/resource_bundle_android.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 years, 7 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 #include "ui/base/resource/resource_bundle.h" 5 #include "ui/base/resource/resource_bundle.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 12 matching lines...) Expand all
23 // Return just the name of the pack file. 23 // Return just the name of the pack file.
24 return FilePath(pak_name.c_str()); 24 return FilePath(pak_name.c_str());
25 } 25 }
26 26
27 } // namespace 27 } // namespace
28 28
29 namespace ui { 29 namespace ui {
30 30
31 void ResourceBundle::LoadCommonResources() { 31 void ResourceBundle::LoadCommonResources() {
32 AddDataPack(GetResourcesPakFilePath("chrome.pak"), 32 AddDataPack(GetResourcesPakFilePath("chrome.pak"),
33 ResourceHandle::kScaleFactor100x); 33 SCALE_FACTOR_100P);
34 AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"), 34 AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
35 ResourceHandle::kScaleFactor100x); 35 SCALE_FACTOR_100P);
36 AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"), 36 AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
37 ResourceHandle::kScaleFactor100x); 37 SCALE_FACTOR_100P);
38 } 38 }
39 39
40 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { 40 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
41 // Flipped image is not used on Android. 41 // Flipped image is not used on Android.
42 DCHECK_EQ(rtl, RTL_DISABLED); 42 DCHECK_EQ(rtl, RTL_DISABLED);
43 return GetImageNamed(resource_id); 43 return GetImageNamed(resource_id);
44 } 44 }
45 45
46 } 46 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698