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

Side by Side Diff: content/browser/android/render_widget_host_connector.cc

Issue 2832153002: Ensure ime adapter gets connected to RWHVA (Closed)
Patch Set: comment Created 3 years, 8 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
« no previous file with comments | « content/browser/android/render_widget_host_connector.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 #include "content/browser/android/render_widget_host_connector.h" 5 #include "content/browser/android/render_widget_host_connector.h"
6 6
7 #include "content/browser/frame_host/interstitial_page_impl.h" 7 #include "content/browser/frame_host/interstitial_page_impl.h"
8 #include "content/browser/renderer_host/render_widget_host_view_android.h" 8 #include "content/browser/renderer_host/render_widget_host_view_android.h"
9 #include "content/browser/web_contents/web_contents_impl.h" 9 #include "content/browser/web_contents/web_contents_impl.h"
10 10
(...skipping 12 matching lines...) Expand all
23 void RenderViewHostChanged(RenderViewHost* old_host, 23 void RenderViewHostChanged(RenderViewHost* old_host,
24 RenderViewHost* new_host) override; 24 RenderViewHost* new_host) override;
25 void DidAttachInterstitialPage() override; 25 void DidAttachInterstitialPage() override;
26 void DidDetachInterstitialPage() override; 26 void DidDetachInterstitialPage() override;
27 void WebContentsDestroyed() override; 27 void WebContentsDestroyed() override;
28 28
29 // RenderWidgetHostViewAndroid::DestructionObserver implementation. 29 // RenderWidgetHostViewAndroid::DestructionObserver implementation.
30 void RenderWidgetHostViewDestroyed( 30 void RenderWidgetHostViewDestroyed(
31 RenderWidgetHostViewAndroid* rwhva) override; 31 RenderWidgetHostViewAndroid* rwhva) override;
32 32
33 void UpdateRenderWidgetHostView(RenderWidgetHostViewAndroid* new_rwhva);
34 RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid() const;
33 RenderWidgetHostViewAndroid* active_rwhva() const { return active_rwhva_; } 35 RenderWidgetHostViewAndroid* active_rwhva() const { return active_rwhva_; }
34 36
35 private: 37 private:
36 void UpdateRenderWidgetHostView(RenderWidgetHostViewAndroid* new_rwhva);
37 RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid() const;
38
39 RenderWidgetHostConnector* const connector_; 38 RenderWidgetHostConnector* const connector_;
40 39
41 // Active RenderWidgetHostView connected to this instance. Can also point to 40 // Active RenderWidgetHostView connected to this instance. Can also point to
42 // an interstitial while it is showing. 41 // an interstitial while it is showing.
43 RenderWidgetHostViewAndroid* active_rwhva_; 42 RenderWidgetHostViewAndroid* active_rwhva_;
44 43
45 DISALLOW_COPY_AND_ASSIGN(Observer); 44 DISALLOW_COPY_AND_ASSIGN(Observer);
46 }; 45 };
47 46
48 RenderWidgetHostConnector::Observer::Observer( 47 RenderWidgetHostConnector::Observer::Observer(
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 ->GetRenderViewHost() 119 ->GetRenderViewHost()
121 ->GetWidget() 120 ->GetWidget()
122 ->GetView(); 121 ->GetView();
123 } 122 }
124 return static_cast<RenderWidgetHostViewAndroid*>(rwhv); 123 return static_cast<RenderWidgetHostViewAndroid*>(rwhv);
125 } 124 }
126 125
127 RenderWidgetHostConnector::RenderWidgetHostConnector(WebContents* web_contents) 126 RenderWidgetHostConnector::RenderWidgetHostConnector(WebContents* web_contents)
128 : render_widget_observer_(new Observer(web_contents, this)) {} 127 : render_widget_observer_(new Observer(web_contents, this)) {}
129 128
129 void RenderWidgetHostConnector::Initialize() {
130 render_widget_observer_->UpdateRenderWidgetHostView(
131 render_widget_observer_->GetRenderWidgetHostViewAndroid());
132 }
133
130 RenderWidgetHostConnector::~RenderWidgetHostConnector() {} 134 RenderWidgetHostConnector::~RenderWidgetHostConnector() {}
131 135
132 RenderWidgetHostViewAndroid* RenderWidgetHostConnector::GetRWHVAForTesting() 136 RenderWidgetHostViewAndroid* RenderWidgetHostConnector::GetRWHVAForTesting()
133 const { 137 const {
134 return render_widget_observer_->active_rwhva(); 138 return render_widget_observer_->active_rwhva();
135 } 139 }
136 140
137 } // namespace content 141 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/render_widget_host_connector.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698