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

Side by Side Diff: components/dom_distiller/core/distilled_page_prefs_android.cc

Issue 1225183002: Font size in DomDistiller prefs syncs with local scaling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge master again Created 5 years, 2 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 "components/dom_distiller/core/distilled_page_prefs_android.h" 5 #include "components/dom_distiller/core/distilled_page_prefs_android.h"
6 6
7 #include "components/dom_distiller/core/distilled_page_prefs.h" 7 #include "components/dom_distiller/core/distilled_page_prefs.h"
8 #include "components/dom_distiller/core/dom_distiller_service.h" 8 #include "components/dom_distiller/core/dom_distiller_service.h"
9 #include "jni/DistilledPagePrefs_jni.h" 9 #include "jni/DistilledPagePrefs_jni.h"
10 10
(...skipping 24 matching lines...) Expand all
35 35
36 void DistilledPagePrefsAndroid::SetTheme(JNIEnv* env, jobject obj, jint theme) { 36 void DistilledPagePrefsAndroid::SetTheme(JNIEnv* env, jobject obj, jint theme) {
37 distilled_page_prefs_->SetTheme( 37 distilled_page_prefs_->SetTheme(
38 static_cast<DistilledPagePrefs::Theme>(theme)); 38 static_cast<DistilledPagePrefs::Theme>(theme));
39 } 39 }
40 40
41 jint DistilledPagePrefsAndroid::GetTheme(JNIEnv* env, jobject obj) { 41 jint DistilledPagePrefsAndroid::GetTheme(JNIEnv* env, jobject obj) {
42 return (int) distilled_page_prefs_->GetTheme(); 42 return (int) distilled_page_prefs_->GetTheme();
43 } 43 }
44 44
45 void DistilledPagePrefsAndroid::SetFontScaling(JNIEnv* env,
46 jobject obj,
47 jfloat scaling) {
48 distilled_page_prefs_->SetFontScaling(static_cast<float>(scaling));
49 }
50
51 jfloat DistilledPagePrefsAndroid::GetFontScaling(JNIEnv* env, jobject obj) {
52 return distilled_page_prefs_->GetFontScaling();
53 }
54
45 jlong Init(JNIEnv* env, 55 jlong Init(JNIEnv* env,
46 const JavaParamRef<jobject>& obj, 56 const JavaParamRef<jobject>& obj,
47 jlong distilled_page_prefs_ptr) { 57 jlong distilled_page_prefs_ptr) {
48 DistilledPagePrefs* distilled_page_prefs = 58 DistilledPagePrefs* distilled_page_prefs =
49 reinterpret_cast<DistilledPagePrefs*>(distilled_page_prefs_ptr); 59 reinterpret_cast<DistilledPagePrefs*>(distilled_page_prefs_ptr);
50 DistilledPagePrefsAndroid* distilled_page_prefs_android = 60 DistilledPagePrefsAndroid* distilled_page_prefs_android =
51 new DistilledPagePrefsAndroid(env, obj, distilled_page_prefs); 61 new DistilledPagePrefsAndroid(env, obj, distilled_page_prefs);
52 return reinterpret_cast<intptr_t>(distilled_page_prefs_android); 62 return reinterpret_cast<intptr_t>(distilled_page_prefs_android);
53 } 63 }
54 64
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 env, java_ref_.obj(), (int)new_font_family); 102 env, java_ref_.obj(), (int)new_font_family);
93 } 103 }
94 104
95 void DistilledPagePrefsObserverAndroid::OnChangeTheme( 105 void DistilledPagePrefsObserverAndroid::OnChangeTheme(
96 DistilledPagePrefs::Theme new_theme) { 106 DistilledPagePrefs::Theme new_theme) {
97 JNIEnv* env = base::android::AttachCurrentThread(); 107 JNIEnv* env = base::android::AttachCurrentThread();
98 Java_DistilledPagePrefsObserverWrapper_onChangeTheme( 108 Java_DistilledPagePrefsObserverWrapper_onChangeTheme(
99 env, java_ref_.obj(), (int)new_theme); 109 env, java_ref_.obj(), (int)new_theme);
100 } 110 }
101 111
112 void DistilledPagePrefsObserverAndroid::OnChangeFontScaling(
113 float scaling) {
114 JNIEnv* env = base::android::AttachCurrentThread();
115 Java_DistilledPagePrefsObserverWrapper_onChangeFontScaling(
116 env, java_ref_.obj(), scaling);
117 }
118
102 jlong InitObserverAndroid(JNIEnv* env, const JavaParamRef<jobject>& obj) { 119 jlong InitObserverAndroid(JNIEnv* env, const JavaParamRef<jobject>& obj) {
103 DistilledPagePrefsObserverAndroid* observer_android = 120 DistilledPagePrefsObserverAndroid* observer_android =
104 new DistilledPagePrefsObserverAndroid(env, obj); 121 new DistilledPagePrefsObserverAndroid(env, obj);
105 return reinterpret_cast<intptr_t>(observer_android); 122 return reinterpret_cast<intptr_t>(observer_android);
106 } 123 }
107 124
108 } // namespace android 125 } // namespace android
109 126
110 } // namespace dom_distiller 127 } // namespace dom_distiller
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698