Metro/HiDPI: Move 1x icons into separate pak file

ui/base/resource/resource_bundle_android.cc

Index: ui/base/resource/resource_bundle_android.cc
diff --git a/ui/base/resource/resource_bundle_android.cc b/ui/base/resource/resource_bundle_android.cc
index 2959d5b62def8fdefeb5db0b9cc379bee7950c71..62a53c6ad3d8588d98ab3eb6621b90834a6425e7 100644
--- a/ui/base/resource/resource_bundle_android.cc
+++ b/ui/base/resource/resource_bundle_android.cc
@@ -12,14 +12,23 @@
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 
+namespace {
+
+FilePath GetResourcesPakFilePath(const std::string& pak_name) {
+  FilePath path;
+  PathService::Get(base::DIR_ANDROID_APP_DATA, &path);
+  DCHECK(!path.empty());
+  return path.AppendASCII("paks").AppendASCII(pak_name.c_str());
+}
+
+}  // namespace
+
 namespace ui {
 
 void ResourceBundle::LoadCommonResources() {
-  FilePath data_path;
-  PathService::Get(base::DIR_ANDROID_APP_DATA, &data_path);
-  DCHECK(!data_path.empty());
-  data_path = data_path.AppendASCII("paks").AppendASCII("chrome.pak");
-  AddDataPack(data_path);
+  AddDataPack(GetResourcesPakFilePath("chrome.pak"));
+  AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"));
+  AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"));
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {