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

Side by Side Diff: chrome/browser/android/preferences/pref_service_bridge.cc

Issue 1542413002: Switch to standard integer types in chrome/browser/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/android/preferences/pref_service_bridge.h" 5 #include "chrome/browser/android/preferences/pref_service_bridge.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 #include <stddef.h>
8 9
9 #include "base/android/build_info.h" 10 #include "base/android/build_info.h"
10 #include "base/android/jni_android.h" 11 #include "base/android/jni_android.h"
11 #include "base/android/jni_string.h" 12 #include "base/android/jni_string.h"
12 #include "base/android/jni_weak_ref.h" 13 #include "base/android/jni_weak_ref.h"
13 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
14 #include "base/files/file_util.h" 15 #include "base/files/file_util.h"
15 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
16 #include "base/prefs/pref_service.h" 17 #include "base/prefs/pref_service.h"
17 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 ContentSettingsType content_type) { 947 ContentSettingsType content_type) {
947 JNIEnv* env = AttachCurrentThread(); 948 JNIEnv* env = AttachCurrentThread();
948 base::android::ScopedJavaLocalRef<jstring> android_permission = 949 base::android::ScopedJavaLocalRef<jstring> android_permission =
949 Java_PrefServiceBridge_getAndroidPermissionForContentSetting( 950 Java_PrefServiceBridge_getAndroidPermissionForContentSetting(
950 env, content_type); 951 env, content_type);
951 if (android_permission.is_null()) 952 if (android_permission.is_null())
952 return std::string(); 953 return std::string();
953 954
954 return ConvertJavaStringToUTF8(android_permission); 955 return ConvertJavaStringToUTF8(android_permission);
955 } 956 }
OLDNEW
« no previous file with comments | « chrome/browser/android/precache/precache_launcher.h ('k') | chrome/browser/android/preferences/website_preference_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698