| Index: blimp/client/core/blimp_contents_impl.h
|
| diff --git a/blimp/client/core/blimp_contents_impl.h b/blimp/client/core/blimp_contents_impl.h
|
| index bbe1dd9c5273f9950cb8c20412041032b1ef4362..9ca7126f7a9ae583c8db7dcd1853a175c9c80aa6 100644
|
| --- a/blimp/client/core/blimp_contents_impl.h
|
| +++ b/blimp/client/core/blimp_contents_impl.h
|
| @@ -7,14 +7,13 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/observer_list.h"
|
| -#include "base/supports_user_data.h"
|
| #include "blimp/client/core/blimp_navigation_controller_delegate.h"
|
| #include "blimp/client/core/blimp_navigation_controller_impl.h"
|
| #include "blimp/client/public/blimp_contents.h"
|
| #include "url/gurl.h"
|
|
|
| #if defined(OS_ANDROID)
|
| -#include "base/android/jni_android.h"
|
| +#include "base/android/scoped_java_ref.h"
|
| #endif // defined(OS_ANDROID)
|
|
|
| namespace blimp {
|
| @@ -30,8 +29,7 @@ class BlimpNavigationController;
|
| // BlimpContentsImpl is the implementation of the core class in
|
| // //blimp/client/core, the BlimpContents.
|
| class BlimpContentsImpl : public BlimpContents,
|
| - public BlimpNavigationControllerDelegate,
|
| - base::SupportsUserData {
|
| + public BlimpNavigationControllerDelegate {
|
| public:
|
| BlimpContentsImpl();
|
| ~BlimpContentsImpl() override;
|
|
|