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 "blimp/client/app/android/toolbar.h" | 5 #include "blimp/client/app/android/toolbar.h" |
6 | 6 |
7 #include "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
8 #include "blimp/client/app/android/blimp_client_session_android.h" | 8 #include "blimp/client/app/android/blimp_client_session_android.h" |
9 #include "components/url_formatter/url_fixer.h" | 9 #include "components/url_formatter/url_fixer.h" |
10 #include "jni/Toolbar_jni.h" | 10 #include "jni/Toolbar_jni.h" |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 // TODO(dtrainor): Find a way to determine whether or not we're at the end of | 85 // TODO(dtrainor): Find a way to determine whether or not we're at the end of |
86 // our history stack. | 86 // our history stack. |
87 return true; | 87 return true; |
88 } | 88 } |
89 | 89 |
90 void Toolbar::OnUrlChanged(int tab_id, const GURL& url) { | 90 void Toolbar::OnUrlChanged(int tab_id, const GURL& url) { |
91 JNIEnv* env = base::android::AttachCurrentThread(); | 91 JNIEnv* env = base::android::AttachCurrentThread(); |
92 ScopedJavaLocalRef<jstring> jurl( | 92 ScopedJavaLocalRef<jstring> jurl( |
93 base::android::ConvertUTF8ToJavaString(env, url.spec())); | 93 base::android::ConvertUTF8ToJavaString(env, url.spec())); |
94 | 94 |
95 Java_Toolbar_onEngineSentUrl(env, java_obj_.obj(), jurl.obj()); | 95 Java_Toolbar_onEngineSentUrl(env, java_obj_, jurl); |
96 } | 96 } |
97 | 97 |
98 void Toolbar::OnFaviconChanged(int tab_id, const SkBitmap& favicon) { | 98 void Toolbar::OnFaviconChanged(int tab_id, const SkBitmap& favicon) { |
99 JNIEnv* env = base::android::AttachCurrentThread(); | 99 JNIEnv* env = base::android::AttachCurrentThread(); |
100 ScopedJavaLocalRef<jobject> jfavicon(gfx::ConvertToJavaBitmap(&favicon)); | 100 ScopedJavaLocalRef<jobject> jfavicon(gfx::ConvertToJavaBitmap(&favicon)); |
101 | 101 |
102 Java_Toolbar_onEngineSentFavicon(env, java_obj_.obj(), jfavicon.obj()); | 102 Java_Toolbar_onEngineSentFavicon(env, java_obj_, jfavicon); |
103 } | 103 } |
104 | 104 |
105 void Toolbar::OnTitleChanged(int tab_id, const std::string& title) { | 105 void Toolbar::OnTitleChanged(int tab_id, const std::string& title) { |
106 JNIEnv* env = base::android::AttachCurrentThread(); | 106 JNIEnv* env = base::android::AttachCurrentThread(); |
107 ScopedJavaLocalRef<jstring> jtitle( | 107 ScopedJavaLocalRef<jstring> jtitle( |
108 base::android::ConvertUTF8ToJavaString(env, title)); | 108 base::android::ConvertUTF8ToJavaString(env, title)); |
109 | 109 |
110 Java_Toolbar_onEngineSentTitle(env, java_obj_.obj(), jtitle.obj()); | 110 Java_Toolbar_onEngineSentTitle(env, java_obj_, jtitle); |
111 } | 111 } |
112 | 112 |
113 void Toolbar::OnLoadingChanged(int tab_id, bool loading) { | 113 void Toolbar::OnLoadingChanged(int tab_id, bool loading) { |
114 JNIEnv* env = base::android::AttachCurrentThread(); | 114 JNIEnv* env = base::android::AttachCurrentThread(); |
115 | 115 |
116 Java_Toolbar_onEngineSentLoading(env, | 116 Java_Toolbar_onEngineSentLoading(env, java_obj_, |
117 java_obj_.obj(), | |
118 static_cast<jboolean>(loading)); | 117 static_cast<jboolean>(loading)); |
119 } | 118 } |
120 | 119 |
121 void Toolbar::OnPageLoadStatusUpdate(int tab_id, bool completed) { | 120 void Toolbar::OnPageLoadStatusUpdate(int tab_id, bool completed) { |
122 JNIEnv* env = base::android::AttachCurrentThread(); | 121 JNIEnv* env = base::android::AttachCurrentThread(); |
123 | 122 |
124 Java_Toolbar_onEngineSentPageLoadStatusUpdate( | 123 Java_Toolbar_onEngineSentPageLoadStatusUpdate( |
125 env, | 124 env, java_obj_, static_cast<jboolean>(completed)); |
126 java_obj_.obj(), | |
127 static_cast<jboolean>(completed)); | |
128 } | 125 } |
129 | 126 |
130 } // namespace client | 127 } // namespace client |
131 } // namespace blimp | 128 } // namespace blimp |
OLD | NEW |