OLD | NEW |
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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 } | 63 } |
64 | 64 |
65 SupervisedUserContentProvider::~SupervisedUserContentProvider() {} | 65 SupervisedUserContentProvider::~SupervisedUserContentProvider() {} |
66 | 66 |
67 void SupervisedUserContentProvider::ShouldProceed( | 67 void SupervisedUserContentProvider::ShouldProceed( |
68 JNIEnv* env, | 68 JNIEnv* env, |
69 const JavaParamRef<jobject>& caller, | 69 const JavaParamRef<jobject>& caller, |
70 const JavaParamRef<jobject>& query_result_jobj, | 70 const JavaParamRef<jobject>& query_result_jobj, |
71 const JavaParamRef<jstring>& url) { | 71 const JavaParamRef<jstring>& url) { |
72 if (!profile_->IsSupervised()) { | 72 if (!profile_->IsSupervised()) { |
73 // User isn't supervised | 73 // User isn't supervised, this can only happen if Chrome isn't signed in, |
74 Java_SupervisedUserQueryReply_onQueryComplete(env, query_result_jobj); | 74 // in which case all requests should be rejected |
| 75 Java_SupervisedUserQueryReply_onQueryFailed( |
| 76 AttachCurrentThread(), query_result_jobj, |
| 77 supervised_user_error_page::NOT_SIGNED_IN, false, true, nullptr, |
| 78 nullptr, nullptr, nullptr, nullptr, nullptr); |
75 return; | 79 return; |
76 } | 80 } |
77 SupervisedUserService* supervised_user_service = | 81 SupervisedUserService* supervised_user_service = |
78 SupervisedUserServiceFactory::GetForProfile(profile_); | 82 SupervisedUserServiceFactory::GetForProfile(profile_); |
79 SupervisedUserURLFilter* url_filter = | 83 SupervisedUserURLFilter* url_filter = |
80 supervised_user_service->GetURLFilterForUIThread(); | 84 supervised_user_service->GetURLFilterForUIThread(); |
81 url_filter->GetFilteringBehaviorForURLWithAsyncChecks( | 85 url_filter->GetFilteringBehaviorForURLWithAsyncChecks( |
82 GURL(base::android::ConvertJavaStringToUTF16(env, url)), | 86 GURL(base::android::ConvertJavaStringToUTF16(env, url)), |
83 base::Bind(&SupervisedUserContentProvider::OnQueryComplete, | 87 base::Bind(&SupervisedUserContentProvider::OnQueryComplete, |
84 weak_factory_.GetWeakPtr(), | 88 weak_factory_.GetWeakPtr(), |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 void SupervisedUserContentProvider::OnInsertRequestSendComplete( | 151 void SupervisedUserContentProvider::OnInsertRequestSendComplete( |
148 ScopedJavaGlobalRef<jobject> insert_reply_jobj, | 152 ScopedJavaGlobalRef<jobject> insert_reply_jobj, |
149 bool sent_ok) { | 153 bool sent_ok) { |
150 Java_SupervisedUserInsertReply_onInsertRequestSendComplete( | 154 Java_SupervisedUserInsertReply_onInsertRequestSendComplete( |
151 AttachCurrentThread(), insert_reply_jobj, sent_ok); | 155 AttachCurrentThread(), insert_reply_jobj, sent_ok); |
152 } | 156 } |
153 | 157 |
154 bool SupervisedUserContentProvider::Register(JNIEnv* env) { | 158 bool SupervisedUserContentProvider::Register(JNIEnv* env) { |
155 return RegisterNativesImpl(env); | 159 return RegisterNativesImpl(env); |
156 } | 160 } |
OLD | NEW |