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

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

Issue 2058263002: Tied up BlimpNavigationController to NavigationFeature (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blimp_core
Patch Set: kmarshall comments 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 #ifndef BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_ 5 #ifndef BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_
6 #define BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_ 6 #define BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/observer_list.h" 9 #include "base/observer_list.h"
10 #include "blimp/client/core/contents/blimp_navigation_controller_delegate.h" 10 #include "blimp/client/core/contents/blimp_navigation_controller_delegate.h"
11 #include "blimp/client/core/contents/blimp_navigation_controller_impl.h" 11 #include "blimp/client/core/contents/blimp_navigation_controller_impl.h"
12 #include "blimp/client/public/contents/blimp_contents.h" 12 #include "blimp/client/public/contents/blimp_contents.h"
13 #include "url/gurl.h" 13 #include "url/gurl.h"
14 14
15 #if defined(OS_ANDROID) 15 #if defined(OS_ANDROID)
16 #include "base/android/scoped_java_ref.h" 16 #include "base/android/scoped_java_ref.h"
17 #endif // defined(OS_ANDROID) 17 #endif // defined(OS_ANDROID)
18 18
19 namespace blimp { 19 namespace blimp {
20 namespace client { 20 namespace client {
21 21
22 #if defined(OS_ANDROID) 22 #if defined(OS_ANDROID)
23 class BlimpContentsImplAndroid; 23 class BlimpContentsImplAndroid;
24 #endif // defined(OS_ANDROID) 24 #endif // defined(OS_ANDROID)
25 25
26 class BlimpContentsObserver; 26 class BlimpContentsObserver;
27 class BlimpNavigationController; 27 class BlimpNavigationController;
28 28
29 // BlimpContentsImpl is the implementation of the core class in 29 // BlimpContentsImpl is the implementation of the core class in
Kevin M 2016/08/01 23:41:57 The code makes this all clear - can you provide a
shaktisahu 2016/08/02 17:47:52 Right. I improved the description in BlimpContents
30 // //blimp/client/core, the BlimpContents. 30 // //blimp/client/core, the BlimpContents.
31 class BlimpContentsImpl : public BlimpContents, 31 class BlimpContentsImpl : public BlimpContents,
32 public BlimpNavigationControllerDelegate { 32 public BlimpNavigationControllerDelegate {
33 public: 33 public:
34 BlimpContentsImpl(); 34 BlimpContentsImpl();
35 ~BlimpContentsImpl() override; 35 ~BlimpContentsImpl() override;
36 36
37 #if defined(OS_ANDROID) 37 #if defined(OS_ANDROID)
38 base::android::ScopedJavaLocalRef<jobject> GetJavaBlimpContentsImpl(); 38 base::android::ScopedJavaLocalRef<jobject> GetJavaBlimpContentsImpl();
39 BlimpContentsImplAndroid* GetBlimpContentsImplAndroid(); 39 BlimpContentsImplAndroid* GetBlimpContentsImplAndroid();
40 #endif // defined(OS_ANDROID) 40 #endif // defined(OS_ANDROID)
41 41
42 // BlimpContents implementation. 42 // BlimpContents implementation.
43 BlimpNavigationControllerImpl& GetNavigationController() override; 43 BlimpNavigationControllerImpl& GetNavigationController() override;
44 void AddObserver(BlimpContentsObserver* observer) override; 44 void AddObserver(BlimpContentsObserver* observer) override;
45 void RemoveObserver(BlimpContentsObserver* observer) override; 45 void RemoveObserver(BlimpContentsObserver* observer) override;
46 46
47 // BlimpNavigationControllerDelegate implementation. 47 // BlimpNavigationControllerDelegate implementation.
48 void NotifyURLLoaded(const GURL& url) override; 48 void OnNavigationStateChanged() override;
49 49
50 private: 50 private:
51 // Handles the back/forward list and loading URLs. 51 // Handles the back/forward list and loading URLs.
52 BlimpNavigationControllerImpl navigation_controller_; 52 BlimpNavigationControllerImpl navigation_controller_;
53 53
54 // A list of all the observers of this BlimpContentsImpl. 54 // A list of all the observers of this BlimpContentsImpl.
55 base::ObserverList<BlimpContentsObserver> observers_; 55 base::ObserverList<BlimpContentsObserver> observers_;
56 56
57 DISALLOW_COPY_AND_ASSIGN(BlimpContentsImpl); 57 DISALLOW_COPY_AND_ASSIGN(BlimpContentsImpl);
58 }; 58 };
59 59
60 } // namespace client 60 } // namespace client
61 } // namespace blimp 61 } // namespace blimp
62 62
63 #endif // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_ 63 #endif // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698