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

Side by Side Diff: blimp/client/core/blimp_contents_impl.cc

Issue 2059443002: Java versions of BlimpContents[,Observer] and BlimpNavigationController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrome-with-blimp
Patch Set: git merge origin/master - track master Created 4 years, 6 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
« no previous file with comments | « blimp/client/core/blimp_contents_impl.h ('k') | blimp/client/core/public/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/blimp_contents_impl.h" 5 #include "blimp/client/core/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 "blimp/client/core/public/blimp_contents_observer.h" 9 #include "blimp/client/core/public/blimp_contents_observer.h"
9 10
11 #if defined(OS_ANDROID)
12 #include "blimp/client/core/android/blimp_contents_impl_android.h"
13 #endif // OS_ANDROID
14
10 namespace blimp { 15 namespace blimp {
11 namespace client { 16 namespace client {
12 17
18 namespace {
19
20 #if defined(OS_ANDROID)
21 const char kBlimpContentsImplAndroidKey[] = "blimp_contents_impl_android";
22 #endif // OS_ANDROID
23 }
24
13 BlimpContentsImpl::BlimpContentsImpl() : navigation_controller_(this) {} 25 BlimpContentsImpl::BlimpContentsImpl() : navigation_controller_(this) {}
14 26
15 BlimpContentsImpl::~BlimpContentsImpl() {} 27 BlimpContentsImpl::~BlimpContentsImpl() {}
16 28
29 #if defined(OS_ANDROID)
30
31 base::android::ScopedJavaLocalRef<jobject>
32 BlimpContentsImpl::GetJavaBlimpContentsImpl() {
33 return GetBlimpContentsImplAndroid()->GetJavaObject();
34 }
35
36 BlimpContentsImplAndroid* BlimpContentsImpl::GetBlimpContentsImplAndroid() {
37 BlimpContentsImplAndroid* blimp_contents_impl_android =
38 static_cast<BlimpContentsImplAndroid*>(
39 GetUserData(kBlimpContentsImplAndroidKey));
40 if (!blimp_contents_impl_android) {
41 blimp_contents_impl_android = new BlimpContentsImplAndroid(this);
42 SetUserData(kBlimpContentsImplAndroidKey, blimp_contents_impl_android);
43 }
44 return blimp_contents_impl_android;
45 }
46
47 #endif // defined(OS_ANDROID)
48
17 BlimpNavigationControllerImpl& BlimpContentsImpl::GetNavigationController() { 49 BlimpNavigationControllerImpl& BlimpContentsImpl::GetNavigationController() {
18 return navigation_controller_; 50 return navigation_controller_;
19 } 51 }
20 52
21 void BlimpContentsImpl::AddObserver(BlimpContentsObserver* observer) { 53 void BlimpContentsImpl::AddObserver(BlimpContentsObserver* observer) {
22 observers_.AddObserver(observer); 54 observers_.AddObserver(observer);
23 } 55 }
24 56
25 void BlimpContentsImpl::RemoveObserver(BlimpContentsObserver* observer) { 57 void BlimpContentsImpl::RemoveObserver(BlimpContentsObserver* observer) {
26 observers_.RemoveObserver(observer); 58 observers_.RemoveObserver(observer);
27 } 59 }
28 60
29 void BlimpContentsImpl::NotifyURLLoaded(const GURL& url) { 61 void BlimpContentsImpl::NotifyURLLoaded(const GURL& url) {
30 FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, OnURLUpdated(url)); 62 FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, OnURLUpdated(url));
31 } 63 }
32 64
33 } // namespace client 65 } // namespace client
34 } // namespace blimp 66 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/client/core/blimp_contents_impl.h ('k') | blimp/client/core/public/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698