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

Unified Diff: ui/base/resource/resource_bundle_android.cc

Issue 419093002: ui: Remove ResourceBundle::LoadCommonResources(). Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: InitParams changes Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/resource/resource_bundle.cc ('k') | ui/base/resource/resource_bundle_auralinux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 630ad5c3908f2fd63df155fd30fcb64821784745..82d0f009ba7a334623d643aa5b17ba2772e939c5 100644
--- a/ui/base/resource/resource_bundle_android.cc
+++ b/ui/base/resource/resource_bundle_android.cc
@@ -8,24 +8,12 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
-#include "base/file_util.h"
-#include "base/files/file_path.h"
#include "base/logging.h"
-#include "base/path_service.h"
-#include "base/strings/stringprintf.h"
#include "jni/ResourceBundle_jni.h"
#include "ui/base/resource/resource_handle.h"
-#include "ui/base/ui_base_paths.h"
namespace ui {
-void ResourceBundle::LoadCommonResources() {
- base::FilePath path;
- PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &path);
- AddDataPackFromPath(path.AppendASCII("chrome_100_percent.pak"),
- SCALE_FACTOR_100P);
-}
-
gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
// Flipped image is not used on Android.
DCHECK_EQ(rtl, RTL_DISABLED);
@@ -44,4 +32,4 @@ bool RegisterResourceBundleAndroid(JNIEnv* env) {
return RegisterNativesImpl(env);
}
-}
+} // namespace ui
« no previous file with comments | « ui/base/resource/resource_bundle.cc ('k') | ui/base/resource/resource_bundle_auralinux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698