| 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_BLIMP_CONTENTS_IMPL_H_ | 5 #ifndef BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_ |
| 6 #define BLIMP_CLIENT_CORE_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/blimp_navigation_controller_delegate.h" | 10 #include "blimp/client/core/contents/blimp_navigation_controller_delegate.h" |
| 11 #include "blimp/client/core/blimp_navigation_controller_impl.h" | 11 #include "blimp/client/core/contents/blimp_navigation_controller_impl.h" |
| 12 #include "blimp/client/public/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) |
| (...skipping 30 matching lines...) Expand all Loading... |
| 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_BLIMP_CONTENTS_IMPL_H_ | 63 #endif // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_ |
| OLD | NEW |