| 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" | 
| 11 #include "third_party/skia/include/core/SkBitmap.h" | 11 #include "third_party/skia/include/core/SkBitmap.h" | 
| 12 #include "ui/gfx/android/java_bitmap.h" | 12 #include "ui/gfx/android/java_bitmap.h" | 
| 13 #include "url/gurl.h" | 13 #include "url/gurl.h" | 
| 14 | 14 | 
|  | 15 using base::android::JavaParamRef; | 
|  | 16 using base::android::ScopedJavaLocalRef; | 
|  | 17 | 
| 15 namespace blimp { | 18 namespace blimp { | 
| 16 namespace client { | 19 namespace client { | 
| 17 | 20 | 
| 18 namespace { | 21 namespace { | 
| 19 | 22 | 
| 20 const int kDummyTabId = 0; | 23 const int kDummyTabId = 0; | 
| 21 | 24 | 
| 22 }  // namespace | 25 }  // namespace | 
| 23 | 26 | 
| 24 static jlong Init(JNIEnv* env, | 27 static jlong Init(JNIEnv* env, | 
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 119   JNIEnv* env = base::android::AttachCurrentThread(); | 122   JNIEnv* env = base::android::AttachCurrentThread(); | 
| 120 | 123 | 
| 121   Java_Toolbar_onEngineSentPageLoadStatusUpdate( | 124   Java_Toolbar_onEngineSentPageLoadStatusUpdate( | 
| 122       env, | 125       env, | 
| 123       java_obj_.obj(), | 126       java_obj_.obj(), | 
| 124       static_cast<jboolean>(completed)); | 127       static_cast<jboolean>(completed)); | 
| 125 } | 128 } | 
| 126 | 129 | 
| 127 }  // namespace client | 130 }  // namespace client | 
| 128 }  // namespace blimp | 131 }  // namespace blimp | 
| OLD | NEW | 
|---|