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

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

Issue 10825111: Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 14 matching lines...) Expand all
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 AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"), 32 AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),
33 SCALE_FACTOR_100P); 33 SCALE_FACTOR_100P);
34 AddDataPackFromPath(GetResourcesPakFilePath( 34 AddDataPackFromPath(GetResourcesPakFilePath(
35 "theme_resources_100_percent.pak"), 35 "chrome_100_percent.pak"),
36 SCALE_FACTOR_100P);
37 AddDataPackFromPath(GetResourcesPakFilePath(
38 "ui_resources_100_percent.pak"),
39 SCALE_FACTOR_100P); 36 SCALE_FACTOR_100P);
40 } 37 }
41 38
42 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { 39 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
43 // Flipped image is not used on Android. 40 // Flipped image is not used on Android.
44 DCHECK_EQ(rtl, RTL_DISABLED); 41 DCHECK_EQ(rtl, RTL_DISABLED);
45 return GetImageNamed(resource_id); 42 return GetImageNamed(resource_id);
46 } 43 }
47 44
48 } 45 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698