OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/core/contents/blimp_contents_impl.h" | 5 #include "blimp/client/core/contents/blimp_contents_impl.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "base/supports_user_data.h" | 8 #include "base/supports_user_data.h" |
9 #include "blimp/client/public/contents/blimp_contents_observer.h" | 9 #include "blimp/client/public/contents/blimp_contents_observer.h" |
10 | 10 |
11 #if defined(OS_ANDROID) | 11 #if defined(OS_ANDROID) |
12 #include "blimp/client/core/contents/android/blimp_contents_impl_android.h" | 12 #include "blimp/client/core/contents/android/blimp_contents_impl_android.h" |
13 #endif // OS_ANDROID | 13 #endif // OS_ANDROID |
14 | 14 |
15 namespace blimp { | 15 namespace blimp { |
16 namespace client { | 16 namespace client { |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
20 #if defined(OS_ANDROID) | 20 #if defined(OS_ANDROID) |
21 const char kBlimpContentsImplAndroidKey[] = "blimp_contents_impl_android"; | 21 const char kBlimpContentsImplAndroidKey[] = "blimp_contents_impl_android"; |
22 #endif // OS_ANDROID | 22 #endif // OS_ANDROID |
23 } | 23 } |
24 | 24 |
25 BlimpContentsImpl::BlimpContentsImpl(int id) | 25 BlimpContentsImpl::BlimpContentsImpl(int id, |
26 : navigation_controller_(this, nullptr), id_(id) {} | 26 NavigationFeature* navigation_feature, |
| 27 ImeFeature* ime_feature) |
| 28 : navigation_controller_(this, navigation_feature), id_(id) {} |
27 | 29 |
28 BlimpContentsImpl::~BlimpContentsImpl() { | 30 BlimpContentsImpl::~BlimpContentsImpl() { |
29 FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, BlimpContentsDying()); | 31 FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, BlimpContentsDying()); |
30 } | 32 } |
31 | 33 |
32 #if defined(OS_ANDROID) | 34 #if defined(OS_ANDROID) |
33 | 35 |
34 base::android::ScopedJavaLocalRef<jobject> | 36 base::android::ScopedJavaLocalRef<jobject> |
35 BlimpContentsImpl::GetJavaBlimpContentsImpl() { | 37 BlimpContentsImpl::GetJavaBlimpContentsImpl() { |
36 return GetBlimpContentsImplAndroid()->GetJavaObject(); | 38 return GetBlimpContentsImplAndroid()->GetJavaObject(); |
(...skipping 28 matching lines...) Expand all Loading... |
65 return observers_.HasObserver(observer); | 67 return observers_.HasObserver(observer); |
66 } | 68 } |
67 | 69 |
68 void BlimpContentsImpl::OnNavigationStateChanged() { | 70 void BlimpContentsImpl::OnNavigationStateChanged() { |
69 FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, | 71 FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, |
70 OnNavigationStateChanged()); | 72 OnNavigationStateChanged()); |
71 } | 73 } |
72 | 74 |
73 } // namespace client | 75 } // namespace client |
74 } // namespace blimp | 76 } // namespace blimp |
OLD | NEW |