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

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

Issue 2258563003: Added features to BlimpClientContext and BlimpContents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ime_feature_move
Patch Set: 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 class ImeFeature;
29 class NavigationFeature;
28 30
29 class BlimpContentsImpl : public BlimpContents, 31 class BlimpContentsImpl : public BlimpContents,
30 public BlimpNavigationControllerDelegate { 32 public BlimpNavigationControllerDelegate {
31 public: 33 public:
32 explicit BlimpContentsImpl(int id); 34 // Ownership of the features remains with the caller.
35 explicit BlimpContentsImpl(int id,
36 NavigationFeature* navigation_feature,
37 ImeFeature* ime_feature);
33 ~BlimpContentsImpl() override; 38 ~BlimpContentsImpl() override;
34 39
35 #if defined(OS_ANDROID) 40 #if defined(OS_ANDROID)
36 base::android::ScopedJavaLocalRef<jobject> GetJavaBlimpContentsImpl(); 41 base::android::ScopedJavaLocalRef<jobject> GetJavaBlimpContentsImpl();
37 BlimpContentsImplAndroid* GetBlimpContentsImplAndroid(); 42 BlimpContentsImplAndroid* GetBlimpContentsImplAndroid();
38 #endif // defined(OS_ANDROID) 43 #endif // defined(OS_ANDROID)
39 44
40 // BlimpContents implementation. 45 // BlimpContents implementation.
41 BlimpNavigationControllerImpl& GetNavigationController() override; 46 BlimpNavigationControllerImpl& GetNavigationController() override;
42 void AddObserver(BlimpContentsObserver* observer) override; 47 void AddObserver(BlimpContentsObserver* observer) override;
(...skipping 18 matching lines...) Expand all
61 // BlimpContentsManager to control the life time of the its observer. 66 // BlimpContentsManager to control the life time of the its observer.
62 int id_; 67 int id_;
63 68
64 DISALLOW_COPY_AND_ASSIGN(BlimpContentsImpl); 69 DISALLOW_COPY_AND_ASSIGN(BlimpContentsImpl);
65 }; 70 };
66 71
67 } // namespace client 72 } // namespace client
68 } // namespace blimp 73 } // namespace blimp
69 74
70 #endif // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_ 75 #endif // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698