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

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

Issue 2292343002: Hooking up Blimp IME with BlimpContents (Closed)
Patch Set: Using Callback Created 4 years, 3 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"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 bool HasObserver(BlimpContentsObserver* observer); 56 bool HasObserver(BlimpContentsObserver* observer);
57 57
58 // BlimpNavigationControllerDelegate implementation. 58 // BlimpNavigationControllerDelegate implementation.
59 void OnNavigationStateChanged() override; 59 void OnNavigationStateChanged() override;
60 60
61 // Pushes the size and scale information to the engine, which will affect the 61 // Pushes the size and scale information to the engine, which will affect the
62 // web content display area for all tabs. 62 // web content display area for all tabs.
63 void SetSizeAndScale(const gfx::Size& size, float device_pixel_ratio); 63 void SetSizeAndScale(const gfx::Size& size, float device_pixel_ratio);
64 64
65 int id() { return id_; } 65 int id() { return id_; }
66 ImeFeature* GetImeFeature() { return ime_feature_; }
David Trainor- moved to gerrit 2016/08/31 05:59:10 Not used?
shaktisahu 2016/08/31 17:28:21 Done.
66 67
67 private: 68 private:
68 // Handles the back/forward list and loading URLs. 69 // Handles the back/forward list and loading URLs.
69 BlimpNavigationControllerImpl navigation_controller_; 70 BlimpNavigationControllerImpl navigation_controller_;
70 71
71 // A list of all the observers of this BlimpContentsImpl. 72 // A list of all the observers of this BlimpContentsImpl.
72 base::ObserverList<BlimpContentsObserver> observers_; 73 base::ObserverList<BlimpContentsObserver> observers_;
73 74
74 // The id is assigned during contents creation. It is used by 75 // The id is assigned during contents creation. It is used by
75 // BlimpContentsManager to control the life time of the its observer. 76 // BlimpContentsManager to control the life time of the its observer.
76 int id_; 77 int id_;
77 78
79 // Handles the text input for web forms.
80 ImeFeature* ime_feature_;
David Trainor- moved to gerrit 2016/08/31 05:59:10 Should we just pass this right into the BlimpConte
shaktisahu 2016/08/31 17:28:21 In that case, we have to pass ImeFeature to BlimpC
David Trainor- moved to gerrit 2016/08/31 18:59:54 That's fine with me. The ime feature feels like a
81
78 // The tab control feature through which the BlimpContentsImpl is able to 82 // The tab control feature through which the BlimpContentsImpl is able to
79 // set size and scale. 83 // set size and scale.
80 // TODO(mlliu): in the long term, we want to put size and scale in a different 84 // TODO(mlliu): in the long term, we want to put size and scale in a different
81 // feature instead of tab control feature. crbug.com/639154. 85 // feature instead of tab control feature. crbug.com/639154.
82 TabControlFeature* tab_control_feature_ = nullptr; 86 TabControlFeature* tab_control_feature_ = nullptr;
83 87
84 // The BlimpContentsView abstracts the platform specific view system details 88 // The BlimpContentsView abstracts the platform specific view system details
85 // from the BlimpContents. 89 // from the BlimpContents.
86 std::unique_ptr<BlimpContentsView> blimp_contents_view_; 90 std::unique_ptr<BlimpContentsView> blimp_contents_view_;
87 91
88 DISALLOW_COPY_AND_ASSIGN(BlimpContentsImpl); 92 DISALLOW_COPY_AND_ASSIGN(BlimpContentsImpl);
89 }; 93 };
90 94
91 } // namespace client 95 } // namespace client
92 } // namespace blimp 96 } // namespace blimp
93 97
94 #endif // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_ 98 #endif // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698