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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_content_provider_android.cc

Issue 1808653003: Move the supervised user error page to a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to fix compile problem Created 4 years, 9 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/supervised_user/supervised_user_content_provider_androi d.h" 5 #include "chrome/browser/supervised_user/supervised_user_content_provider_androi d.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/profiles/profile_manager.h" 10 #include "chrome/browser/profiles/profile_manager.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 supervised_user_service->AddURLAccessRequest( 96 supervised_user_service->AddURLAccessRequest(
97 GURL(base::android::ConvertJavaStringToUTF16(env, url)), 97 GURL(base::android::ConvertJavaStringToUTF16(env, url)),
98 base::Bind(&SupervisedUserContentProvider::OnInsertRequestSendComplete, 98 base::Bind(&SupervisedUserContentProvider::OnInsertRequestSendComplete,
99 weak_factory_.GetWeakPtr(), 99 weak_factory_.GetWeakPtr(),
100 ScopedJavaGlobalRef<jobject>(env, insert_result_jobj.obj()))); 100 ScopedJavaGlobalRef<jobject>(env, insert_result_jobj.obj())));
101 } 101 }
102 102
103 void SupervisedUserContentProvider::OnQueryComplete( 103 void SupervisedUserContentProvider::OnQueryComplete(
104 ScopedJavaGlobalRef<jobject> query_reply_jobj, 104 ScopedJavaGlobalRef<jobject> query_reply_jobj,
105 SupervisedUserURLFilter::FilteringBehavior behavior, 105 SupervisedUserURLFilter::FilteringBehavior behavior,
106 SupervisedUserURLFilter::FilteringBehaviorReason reason, 106 supervised_user_error_page::FilteringBehaviorReason reason,
107 bool /* uncertain */) { 107 bool /* uncertain */) {
108 if (behavior != SupervisedUserURLFilter::BLOCK) { 108 if (behavior != SupervisedUserURLFilter::BLOCK) {
109 Java_SupervisedUserQueryReply_onQueryComplete( 109 Java_SupervisedUserQueryReply_onQueryComplete(
110 AttachCurrentThread(), query_reply_jobj.obj(), true, nullptr); 110 AttachCurrentThread(), query_reply_jobj.obj(), true, nullptr);
111 } else { 111 } else {
112 JNIEnv* env = AttachCurrentThread(); 112 JNIEnv* env = AttachCurrentThread();
113 Java_SupervisedUserQueryReply_onQueryComplete( 113 Java_SupervisedUserQueryReply_onQueryComplete(
114 env, query_reply_jobj.obj(), false, 114 env, query_reply_jobj.obj(), false,
115 base::android::ConvertUTF8ToJavaString( 115 base::android::ConvertUTF8ToJavaString(
116 env, SupervisedUserInterstitial::GetHTMLContents(profile_, reason)) 116 env, SupervisedUserInterstitial::GetHTMLContents(profile_, reason))
(...skipping 15 matching lines...) Expand all
132 void SupervisedUserContentProvider::OnInsertRequestSendComplete( 132 void SupervisedUserContentProvider::OnInsertRequestSendComplete(
133 ScopedJavaGlobalRef<jobject> insert_reply_jobj, 133 ScopedJavaGlobalRef<jobject> insert_reply_jobj,
134 bool sent_ok) { 134 bool sent_ok) {
135 Java_SupervisedUserInsertReply_onInsertRequestSendComplete( 135 Java_SupervisedUserInsertReply_onInsertRequestSendComplete(
136 AttachCurrentThread(), insert_reply_jobj.obj(), sent_ok); 136 AttachCurrentThread(), insert_reply_jobj.obj(), sent_ok);
137 } 137 }
138 138
139 bool SupervisedUserContentProvider::Register(JNIEnv* env) { 139 bool SupervisedUserContentProvider::Register(JNIEnv* env) {
140 return RegisterNativesImpl(env); 140 return RegisterNativesImpl(env);
141 } 141 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698