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

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

Issue 1465363002: [Storage] Android - ManageSpace UI, Important Origins, and CBD Dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: whoops, forgot files Created 4 years, 7 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 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 const JavaParamRef<jobject>& java_callback) { 651 const JavaParamRef<jobject>& java_callback) {
652 std::vector<std::string> important_domains = 652 std::vector<std::string> important_domains =
653 ImportantSitesUtil::GetImportantRegisterableDomains(GetOriginalProfile(), 653 ImportantSitesUtil::GetImportantRegisterableDomains(GetOriginalProfile(),
654 kMaxImportantSites); 654 kMaxImportantSites);
655 ScopedJavaLocalRef<jobjectArray> string_array = 655 ScopedJavaLocalRef<jobjectArray> string_array =
656 base::android::ToJavaArrayOfStrings(env, important_domains); 656 base::android::ToJavaArrayOfStrings(env, important_domains);
657 Java_ImportantSitesCallback_onImportantRegisterableDomainsReady( 657 Java_ImportantSitesCallback_onImportantRegisterableDomainsReady(
658 env, java_callback.obj(), string_array.obj()); 658 env, java_callback.obj(), string_array.obj());
659 } 659 }
660 660
661 static jint GetMaxImportantSites(JNIEnv* env,
662 const JavaParamRef<jclass>& clazz) {
663 return kMaxImportantSites;
664 }
665
666 static void MarkOriginAsImportant(JNIEnv* env,
Theresa 2016/05/13 06:02:31 nit: MarkOriginAsImportantForTesting for this meth
dmurph 2016/05/13 23:46:24 Done.
667 const JavaParamRef<jclass>& clazz,
668 const JavaParamRef<jstring>& jorigin) {
669 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin));
670 CHECK(origin.is_valid());
671 ImportantSitesUtil::MarkOriginAsImportantForTesting(GetOriginalProfile(),
672 origin);
673 }
674
661 static void ShowNoticeAboutOtherFormsOfBrowsingHistory( 675 static void ShowNoticeAboutOtherFormsOfBrowsingHistory(
662 ScopedJavaGlobalRef<jobject>* listener, 676 ScopedJavaGlobalRef<jobject>* listener,
663 bool show) { 677 bool show) {
664 JNIEnv* env = AttachCurrentThread(); 678 JNIEnv* env = AttachCurrentThread();
665 if (!show) 679 if (!show)
666 return; 680 return;
667 Java_OtherFormsOfBrowsingHistoryListener_showNoticeAboutOtherFormsOfBrowsingHi story( 681 Java_OtherFormsOfBrowsingHistoryListener_showNoticeAboutOtherFormsOfBrowsingHi story(
668 env, listener->obj()); 682 env, listener->obj());
669 } 683 }
670 684
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 1137
1124 return ConvertJavaStringToUTF8(android_permission); 1138 return ConvertJavaStringToUTF8(android_permission);
1125 } 1139 }
1126 1140
1127 static void SetSupervisedUserId(JNIEnv* env, 1141 static void SetSupervisedUserId(JNIEnv* env,
1128 const JavaParamRef<jobject>& obj, 1142 const JavaParamRef<jobject>& obj,
1129 const JavaParamRef<jstring>& pref) { 1143 const JavaParamRef<jstring>& pref) {
1130 GetPrefService()->SetString(prefs::kSupervisedUserId, 1144 GetPrefService()->SetString(prefs::kSupervisedUserId,
1131 ConvertJavaStringToUTF8(env, pref)); 1145 ConvertJavaStringToUTF8(env, pref));
1132 } 1146 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698