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

Unified Diff: chrome/browser/supervised_user/supervised_user_content_provider_android.cc

Issue 1452603002: Supervised user web restrictions content provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reply to more comments including changing interthread communication Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/supervised_user/supervised_user_content_provider_android.cc
diff --git a/chrome/browser/supervised_user/supervised_user_content_provider_android.cc b/chrome/browser/supervised_user/supervised_user_content_provider_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..22c48ec774d082905da6b9fcc870c35345eca363
--- /dev/null
+++ b/chrome/browser/supervised_user/supervised_user_content_provider_android.cc
@@ -0,0 +1,144 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/supervised_user/supervised_user_content_provider_android.h"
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/supervised_user/supervised_user_interstitial.h"
+#include "chrome/browser/supervised_user/supervised_user_service.h"
+#include "chrome/browser/supervised_user/supervised_user_service_factory.h"
+#include "jni/SupervisedUserContentProvider_jni.h"
+
+using base::android::JavaRef;
+using base::android::JavaParamRef;
+using base::android::ScopedJavaGlobalRef;
+using base::android::AttachCurrentThread;
+
+namespace {
+
+class UrlFilterObserver : public SupervisedUserURLFilter::Observer {
+ public:
+ UrlFilterObserver(JNIEnv* env,
+ const ScopedJavaGlobalRef<jobject>& java_content_provider)
+ : java_content_provider_(java_content_provider) {}
+
+ virtual ~UrlFilterObserver() {}
+
+ private:
+ void OnSiteListUpdated() override {
+ Java_SupervisedUserContentProvider_onSupervisedUserFilterUpdated(
+ AttachCurrentThread(), java_content_provider_.obj());
+ }
+ ScopedJavaGlobalRef<jobject> java_content_provider_;
+};
+
+} // namespace
+
+static jlong CreateSupervisedUserContentProvider(
+ JNIEnv* env,
+ const JavaParamRef<jobject>& caller) {
+ return reinterpret_cast<intptr_t>(
+ new SupervisedUserContentProvider(env, caller));
+}
+
+SupervisedUserContentProvider::SupervisedUserContentProvider(
+ JNIEnv* env,
+ const JavaParamRef<jobject>& caller)
+ : profile_(ProfileManager::GetLastUsedProfile()),
+ java_content_provider_(env, caller),
+ weak_factory_(this) {
+ if (profile_->IsSupervised()) {
+ SupervisedUserService* supervised_user_service =
+ SupervisedUserServiceFactory::GetForProfile(profile_);
+ SupervisedUserURLFilter* url_filter =
+ supervised_user_service->GetURLFilterForUIThread();
+ url_filter->AddObserver(new UrlFilterObserver(env, java_content_provider_));
+ }
+}
+
+SupervisedUserContentProvider::~SupervisedUserContentProvider() {}
+
+void SupervisedUserContentProvider::ShouldProceed(
+ JNIEnv* env,
+ const JavaParamRef<jobject>& caller,
+ const JavaParamRef<jobject>& query_result_jobj,
+ const JavaParamRef<jstring>& url) {
+ if (!profile_->IsSupervised()) {
+ // User isn't supervised
+ Java_SupervisedUserQueryReply_onQueryComplete(env, query_result_jobj.obj(),
+ true, nullptr);
+ return;
+ }
+ SupervisedUserService* supervised_user_service =
+ SupervisedUserServiceFactory::GetForProfile(profile_);
+ SupervisedUserURLFilter* url_filter =
+ supervised_user_service->GetURLFilterForUIThread();
+ url_filter->GetFilteringBehaviorForURLWithAsyncChecks(
+ GURL(base::android::ConvertJavaStringToUTF16(env, url)),
+ base::Bind(
+ &SupervisedUserContentProvider::OnQueryComplete,
+ weak_factory_.GetWeakPtr(),
+ new ScopedJavaGlobalRef<jobject>(env, query_result_jobj.obj())));
+}
+
+void SupervisedUserContentProvider::RequestInsert(
+ JNIEnv* env,
+ const JavaParamRef<jobject>& caller,
+ const JavaParamRef<jobject>& insert_result_jobj,
+ const JavaParamRef<jstring>& url) {
+ if (!profile_->IsSupervised())
+ return;
+ SupervisedUserService* supervised_user_service =
+ SupervisedUserServiceFactory::GetForProfile(profile_);
+ supervised_user_service->AddURLAccessRequest(
+ GURL(base::android::ConvertJavaStringToUTF16(env, url)),
+ base::Bind(
+ &SupervisedUserContentProvider::OnInsertRequestSendComplete,
+ weak_factory_.GetWeakPtr(),
+ new ScopedJavaGlobalRef<jobject>(env, insert_result_jobj.obj())));
+}
+
+void SupervisedUserContentProvider::OnQueryComplete(
+ ScopedJavaGlobalRef<jobject>* query_reply_jobj,
Bernhard Bauer 2015/12/17 11:13:21 You can just copy a ScopedJavaGlobalRef.
aberent 2015/12/17 14:59:08 Done. As discussed.
+ SupervisedUserURLFilter::FilteringBehavior behavior,
+ SupervisedUserURLFilter::FilteringBehaviorReason reason,
+ bool /* uncertain */) {
+ if (behavior != SupervisedUserURLFilter::BLOCK) {
+ Java_SupervisedUserQueryReply_onQueryComplete(
+ AttachCurrentThread(), query_reply_jobj->obj(), true, nullptr);
+ } else {
+ JNIEnv* env = AttachCurrentThread();
+ Java_SupervisedUserQueryReply_onQueryComplete(
+ env, query_reply_jobj->obj(), false,
+ base::android::ConvertUTF8ToJavaString(
+ env, SupervisedUserInterstitial::GetHTMLContents(profile_, reason))
+ .obj());
+ }
+ delete query_reply_jobj;
+}
+
+void SupervisedUserContentProvider::SetFilterForTesting(JNIEnv* env,
+ jobject caller) {
+ if (!profile_->IsSupervised())
+ return;
+ SupervisedUserService* supervised_user_service =
+ SupervisedUserServiceFactory::GetForProfile(profile_);
+ SupervisedUserURLFilter* url_filter =
+ supervised_user_service->GetURLFilterForUIThread();
+ url_filter->SetDefaultFilteringBehavior(SupervisedUserURLFilter::BLOCK);
+}
+
+void SupervisedUserContentProvider::OnInsertRequestSendComplete(
+ ScopedJavaGlobalRef<jobject>* insert_reply_jobj,
Bernhard Bauer 2015/12/17 11:13:21 This would leak (but as mentioned above, you can j
aberent 2015/12/17 14:59:08 Done.
+ bool sent_ok) {
+ Java_SupervisedUserInsertReply_onInsertRequestSendComplete(
+ AttachCurrentThread(), insert_reply_jobj->obj(), sent_ok);
+}
+
+bool SupervisedUserContentProvider::Register(JNIEnv* env) {
+ return RegisterNativesImpl(env);
+}

Powered by Google App Engine
This is Rietveld 408576698