Chromium Code Reviews| 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 #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" |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 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; |
|
Kevin M
2016/07/27 23:35:17
This should be a pointer, not a reference - refere
David Trainor- moved to gerrit
2016/07/28 16:43:24
We were following the pattern used by WebContents
nyquist
2016/07/28 19:23:06
Yeah, when I added this I was following the exact
Kevin M
2016/08/01 23:41:57
The convention that Wez and I have become very acc
| |
| 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_ |
| OLD | NEW |