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 "chrome/browser/android/offline_pages/offline_page_bridge.h" | 5 #include "chrome/browser/android/offline_pages/offline_page_bridge.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
616 ui_adapter_delegate->UnregisterTab(tab_id); | 616 ui_adapter_delegate->UnregisterTab(tab_id); |
617 } | 617 } |
618 | 618 |
619 void OfflinePageBridge::NotifyIfDoneLoading() const { | 619 void OfflinePageBridge::NotifyIfDoneLoading() const { |
620 if (!offline_page_model_->is_loaded()) | 620 if (!offline_page_model_->is_loaded()) |
621 return; | 621 return; |
622 JNIEnv* env = base::android::AttachCurrentThread(); | 622 JNIEnv* env = base::android::AttachCurrentThread(); |
623 Java_OfflinePageBridge_offlinePageModelLoaded(env, java_ref_); | 623 Java_OfflinePageBridge_offlinePageModelLoaded(env, java_ref_); |
624 } | 624 } |
625 | 625 |
626 | |
fgorski
2017/03/03 17:44:37
I'd skip changing this file for a simpler merge, i
| |
627 ScopedJavaLocalRef<jobject> OfflinePageBridge::CreateClientId( | 626 ScopedJavaLocalRef<jobject> OfflinePageBridge::CreateClientId( |
628 JNIEnv* env, | 627 JNIEnv* env, |
629 const ClientId& client_id) const { | 628 const ClientId& client_id) const { |
630 return Java_OfflinePageBridge_createClientId( | 629 return Java_OfflinePageBridge_createClientId( |
631 env, ConvertUTF8ToJavaString(env, client_id.name_space), | 630 env, ConvertUTF8ToJavaString(env, client_id.name_space), |
632 ConvertUTF8ToJavaString(env, client_id.id)); | 631 ConvertUTF8ToJavaString(env, client_id.id)); |
633 } | 632 } |
634 | 633 |
635 bool RegisterOfflinePageBridge(JNIEnv* env) { | 634 bool RegisterOfflinePageBridge(JNIEnv* env) { |
636 return RegisterNativesImpl(env); | 635 return RegisterNativesImpl(env); |
637 } | 636 } |
638 | 637 |
639 } // namespace android | 638 } // namespace android |
640 } // namespace offline_pages | 639 } // namespace offline_pages |
OLD | NEW |