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

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

Issue 2201433002: Migrate TabControlFeature from 0.5 to 0.6 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove BlmipContentImpl default constructor, Move BlimpContentsDeletionObserver declaration to blim… 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(int id)
26 : navigation_controller_(this), id_(id) {}
26 27
27 BlimpContentsImpl::~BlimpContentsImpl() {} 28 BlimpContentsImpl::~BlimpContentsImpl() {
29 FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, OnContentsDestroyed());
30 }
28 31
29 #if defined(OS_ANDROID) 32 #if defined(OS_ANDROID)
30 33
31 base::android::ScopedJavaLocalRef<jobject> 34 base::android::ScopedJavaLocalRef<jobject>
32 BlimpContentsImpl::GetJavaBlimpContentsImpl() { 35 BlimpContentsImpl::GetJavaBlimpContentsImpl() {
33 return GetBlimpContentsImplAndroid()->GetJavaObject(); 36 return GetBlimpContentsImplAndroid()->GetJavaObject();
34 } 37 }
35 38
36 BlimpContentsImplAndroid* BlimpContentsImpl::GetBlimpContentsImplAndroid() { 39 BlimpContentsImplAndroid* BlimpContentsImpl::GetBlimpContentsImplAndroid() {
37 BlimpContentsImplAndroid* blimp_contents_impl_android = 40 BlimpContentsImplAndroid* blimp_contents_impl_android =
(...skipping 19 matching lines...) Expand all
57 void BlimpContentsImpl::RemoveObserver(BlimpContentsObserver* observer) { 60 void BlimpContentsImpl::RemoveObserver(BlimpContentsObserver* observer) {
58 observers_.RemoveObserver(observer); 61 observers_.RemoveObserver(observer);
59 } 62 }
60 63
61 void BlimpContentsImpl::NotifyURLLoaded(const GURL& url) { 64 void BlimpContentsImpl::NotifyURLLoaded(const GURL& url) {
62 FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, OnURLUpdated(url)); 65 FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, OnURLUpdated(url));
63 } 66 }
64 67
65 } // namespace client 68 } // namespace client
66 } // namespace blimp 69 } // namespace blimp
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698