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

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

Issue 529273002: Change base/file_utils.h includes to base/files/file_utils.h in gin, google_apis, printing, sql, ui… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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 unified diff | Download patch
« no previous file with comments | « ui/base/resource/resource_bundle.cc ('k') | ui/base/resource/resource_bundle_ios.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
11 #include "base/file_util.h"
12 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/files/file_util.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "jni/ResourceBundle_jni.h" 16 #include "jni/ResourceBundle_jni.h"
17 #include "ui/base/resource/resource_handle.h" 17 #include "ui/base/resource/resource_handle.h"
18 #include "ui/base/ui_base_paths.h" 18 #include "ui/base/ui_base_paths.h"
19 19
20 namespace ui { 20 namespace ui {
21 21
22 void ResourceBundle::LoadCommonResources() { 22 void ResourceBundle::LoadCommonResources() {
(...skipping 15 matching lines...) Expand all
38 env, 38 env,
39 base::android::GetApplicationContext(), 39 base::android::GetApplicationContext(),
40 base::android::ConvertUTF8ToJavaString(env, filename).obj()); 40 base::android::ConvertUTF8ToJavaString(env, filename).obj());
41 } 41 }
42 42
43 bool RegisterResourceBundleAndroid(JNIEnv* env) { 43 bool RegisterResourceBundleAndroid(JNIEnv* env) {
44 return RegisterNativesImpl(env); 44 return RegisterNativesImpl(env);
45 } 45 }
46 46
47 } 47 }
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle.cc ('k') | ui/base/resource/resource_bundle_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698