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

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

Issue 2058263002: Tied up BlimpNavigationController to NavigationFeature (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blimp_core
Patch Set: Removed BlimpContentsTest.java Created 4 years, 4 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
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/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() : navigation_controller_(this) {} 25 BlimpContentsImpl::BlimpContentsImpl()
26 : navigation_controller_(this, nullptr) {}
26 27
27 BlimpContentsImpl::~BlimpContentsImpl() {} 28 BlimpContentsImpl::~BlimpContentsImpl() {}
28 29
29 #if defined(OS_ANDROID) 30 #if defined(OS_ANDROID)
30 31
31 base::android::ScopedJavaLocalRef<jobject> 32 base::android::ScopedJavaLocalRef<jobject>
32 BlimpContentsImpl::GetJavaBlimpContentsImpl() { 33 BlimpContentsImpl::GetJavaBlimpContentsImpl() {
33 return GetBlimpContentsImplAndroid()->GetJavaObject(); 34 return GetBlimpContentsImplAndroid()->GetJavaObject();
34 } 35 }
35 36
(...skipping 15 matching lines...) Expand all
51 } 52 }
52 53
53 void BlimpContentsImpl::AddObserver(BlimpContentsObserver* observer) { 54 void BlimpContentsImpl::AddObserver(BlimpContentsObserver* observer) {
54 observers_.AddObserver(observer); 55 observers_.AddObserver(observer);
55 } 56 }
56 57
57 void BlimpContentsImpl::RemoveObserver(BlimpContentsObserver* observer) { 58 void BlimpContentsImpl::RemoveObserver(BlimpContentsObserver* observer) {
58 observers_.RemoveObserver(observer); 59 observers_.RemoveObserver(observer);
59 } 60 }
60 61
61 void BlimpContentsImpl::NotifyURLLoaded(const GURL& url) { 62 void BlimpContentsImpl::OnNavigationStateChanged() {
62 FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, OnURLUpdated(url)); 63 FOR_EACH_OBSERVER(BlimpContentsObserver, observers_,
64 OnNavigationStateChanged());
63 } 65 }
64 66
65 } // namespace client 67 } // namespace client
66 } // namespace blimp 68 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/client/core/contents/blimp_contents_impl.h ('k') | blimp/client/core/contents/blimp_contents_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698