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

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

Issue 2255533002: Add TabControlFeature to BlimpClientContextImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pass TabControlFeature* to BlimpContentsImpl's constructor, remove blimp contents factory 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 TabControlFeature;
28 29
29 class BlimpContentsImpl : public BlimpContents, 30 class BlimpContentsImpl : public BlimpContents,
30 public BlimpNavigationControllerDelegate { 31 public BlimpNavigationControllerDelegate {
31 public: 32 public:
32 explicit BlimpContentsImpl(int id); 33 explicit BlimpContentsImpl(int id, TabControlFeature* tab_control_feature);
33 ~BlimpContentsImpl() override; 34 ~BlimpContentsImpl() override;
34 35
35 #if defined(OS_ANDROID) 36 #if defined(OS_ANDROID)
36 base::android::ScopedJavaLocalRef<jobject> GetJavaBlimpContentsImpl(); 37 base::android::ScopedJavaLocalRef<jobject> GetJavaBlimpContentsImpl();
37 BlimpContentsImplAndroid* GetBlimpContentsImplAndroid(); 38 BlimpContentsImplAndroid* GetBlimpContentsImplAndroid();
38 #endif // defined(OS_ANDROID) 39 #endif // defined(OS_ANDROID)
39 40
40 // BlimpContents implementation. 41 // BlimpContents implementation.
41 BlimpNavigationControllerImpl& GetNavigationController() override; 42 BlimpNavigationControllerImpl& GetNavigationController() override;
42 void AddObserver(BlimpContentsObserver* observer) override; 43 void AddObserver(BlimpContentsObserver* observer) override;
43 void RemoveObserver(BlimpContentsObserver* observer) override; 44 void RemoveObserver(BlimpContentsObserver* observer) override;
44 45
45 // Check if some observer is in the observer list. 46 // Check if some observer is in the observer list.
46 bool HasObserver(BlimpContentsObserver* observer); 47 bool HasObserver(BlimpContentsObserver* observer);
47 48
48 // BlimpNavigationControllerDelegate implementation. 49 // BlimpNavigationControllerDelegate implementation.
49 void OnNavigationStateChanged() override; 50 void OnNavigationStateChanged() override;
50 51
52 // Pushes the size and scale information to the engine, which will affect the
53 // web content display area for all tabs.
54 void SetSizeAndScale(const gfx::Size& size, float device_pixel_ratio);
55
56 // This method is added for testing purpose.
57 TabControlFeature* tab_control_feature() { return tab_control_feature_; }
David Trainor- moved to gerrit 2016/08/18 17:41:58 Do we need to expose this here? Could we just rel
Menglin 2016/08/19 00:50:21 Done.
58
51 int id() { return id_; } 59 int id() { return id_; }
52 60
53 private: 61 private:
54 // Handles the back/forward list and loading URLs. 62 // Handles the back/forward list and loading URLs.
55 BlimpNavigationControllerImpl navigation_controller_; 63 BlimpNavigationControllerImpl navigation_controller_;
56 64
57 // A list of all the observers of this BlimpContentsImpl. 65 // A list of all the observers of this BlimpContentsImpl.
58 base::ObserverList<BlimpContentsObserver> observers_; 66 base::ObserverList<BlimpContentsObserver> observers_;
59 67
60 // The id is assigned during contents creation. It is used by 68 // The id is assigned during contents creation. It is used by
61 // BlimpContentsManager to control the life time of the its observer. 69 // BlimpContentsManager to control the life time of the its observer.
62 int id_; 70 int id_;
63 71
72 // The tab control feature through which the BlimpContentsImpl is able to
73 // set size and scale.
74 TabControlFeature* tab_control_feature_ = nullptr;
David Trainor- moved to gerrit 2016/08/18 17:41:58 Can we add a TODO and a bug to get rid of this and
Menglin 2016/08/19 00:50:21 Done.
75
64 DISALLOW_COPY_AND_ASSIGN(BlimpContentsImpl); 76 DISALLOW_COPY_AND_ASSIGN(BlimpContentsImpl);
65 }; 77 };
66 78
67 } // namespace client 79 } // namespace client
68 } // namespace blimp 80 } // namespace blimp
69 81
70 #endif // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_ 82 #endif // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698