Observer Support for DistilledPagePrefs

components/dom_distiller/core/distilled_page_prefs_android.cc

 // Copyright 2014 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 "components/dom_distiller/core/distilled_page_prefs_android.h"
 
 #include "components/dom_distiller/core/distilled_page_prefs.h"
+#include "components/dom_distiller/core/distilled_page_prefs_observer_wrapper.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
+

[nyquist, 2014/07/22 22:51:37]

Nit: Remove empty newline.

[sunangel, 2014/07/23 16:22:04]

Done.

 #include "jni/DistilledPagePrefs_jni.h"
 
 namespace dom_distiller {
+
 namespace android {
 
 DistilledPagePrefsAndroid::DistilledPagePrefsAndroid(
     JNIEnv* env,
     jobject obj,
     DistilledPagePrefs* distillerPagePrefsPtr)

[nyquist, 2014/07/22 22:51:37]

use _ instead of camelcase throughout this file.

[sunangel, 2014/07/23 16:22:04]

Done.

     : distilled_page_prefs_(distillerPagePrefsPtr) {
 }
 
 DistilledPagePrefsAndroid::~DistilledPagePrefsAndroid() {
 }
 
 void DistilledPagePrefsAndroid::SetTheme(JNIEnv* env, jobject obj, jint theme) {
   distilled_page_prefs_->SetTheme((DistilledPagePrefs::Theme)theme);
 }
 
 jint DistilledPagePrefsAndroid::GetTheme(JNIEnv* env, jobject obj) {
   return (int)distilled_page_prefs_->GetTheme();
 }
 
 jlong Init(JNIEnv* env, jobject obj, jlong distilledPagePrefsPtr) {
   DistilledPagePrefs* distilledPagePrefs =
       reinterpret_cast<DistilledPagePrefs*>(distilledPagePrefsPtr);
   DistilledPagePrefsAndroid* distilled_page_prefs_android =
       new DistilledPagePrefsAndroid(env, obj, distilledPagePrefs);
   return reinterpret_cast<intptr_t>(distilled_page_prefs_android);
 }
 
 bool DistilledPagePrefsAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
+void DistilledPagePrefsAndroid::RemoveObserver(JNIEnv* env,

[nyquist, 2014/07/22 22:51:37]

Could you re-order these two functions to match the header?

[sunangel, 2014/07/23 16:22:04]

Done.

+                                               jobject obj,
+                                               jlong observerPtr) {
+  DistilledPagePrefsObserverWrapper* distilledPagePrefsObserverWrapper =
+      reinterpret_cast<DistilledPagePrefsObserverWrapper*>(observerPtr);
+  distilled_page_prefs_->RemoveObserver(distilledPagePrefsObserverWrapper);
+}
+
+void DistilledPagePrefsAndroid::AddObserver(JNIEnv* env,
+                                            jobject obj,
+                                            jlong observerPtr) {
+  DistilledPagePrefsObserverWrapper* distilledPagePrefsObserverWrapper =
+      reinterpret_cast<DistilledPagePrefsObserverWrapper*>(observerPtr);
+  distilled_page_prefs_->AddObserver(distilledPagePrefsObserverWrapper);
+}
+
 }  // namespace android
+
 }  // namespace dom_distiller