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

Side by Side Diff: content/browser/web_contents/web_contents_view_android.cc

Issue 11308083: Fix the html select tag showing up at the wrong position. This was a regression from r166446. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix win_rel Created 8 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/web_contents/web_contents_view_android.h" 5 #include "content/browser/web_contents/web_contents_view_android.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/android/content_view_core_impl.h" 8 #include "content/browser/android/content_view_core_impl.h"
9 #include "content/browser/android/media_player_manager_android.h" 9 #include "content/browser/android/media_player_manager_android.h"
10 #include "content/browser/renderer_host/render_widget_host_view_android.h" 10 #include "content/browser/renderer_host/render_widget_host_view_android.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 // native view (i.e. ContentView) how to obtain a reference to this widget in 73 // native view (i.e. ContentView) how to obtain a reference to this widget in
74 // order to paint it. See ContentView::GetRenderWidgetHostViewAndroid for an 74 // order to paint it. See ContentView::GetRenderWidgetHostViewAndroid for an
75 // example of how this is achieved for InterstitialPages. 75 // example of how this is achieved for InterstitialPages.
76 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host); 76 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host);
77 RenderWidgetHostView* view = new RenderWidgetHostViewAndroid( 77 RenderWidgetHostView* view = new RenderWidgetHostViewAndroid(
78 rwhi, content_view_core_); 78 rwhi, content_view_core_);
79 view->Show(); 79 view->Show();
80 return view; 80 return view;
81 } 81 }
82 82
83 void WebContentsViewAndroid::SetView(RenderWidgetHostView* view) {
84 }
85
83 gfx::NativeView WebContentsViewAndroid::GetNativeView() const { 86 gfx::NativeView WebContentsViewAndroid::GetNativeView() const {
84 return content_view_core_; 87 return content_view_core_;
85 } 88 }
86 89
87 gfx::NativeView WebContentsViewAndroid::GetContentNativeView() const { 90 gfx::NativeView WebContentsViewAndroid::GetContentNativeView() const {
88 return content_view_core_; 91 return content_view_core_;
89 } 92 }
90 93
91 gfx::NativeWindow WebContentsViewAndroid::GetTopLevelNativeWindow() const { 94 gfx::NativeWindow WebContentsViewAndroid::GetTopLevelNativeWindow() const {
92 return content_view_core_->GetWindowAndroid(); 95 return content_view_core_->GetWindowAndroid();
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 // This is called when we the renderer asks us to take focus back (i.e., it has 212 // This is called when we the renderer asks us to take focus back (i.e., it has
210 // iterated past the last focusable element on the page). 213 // iterated past the last focusable element on the page).
211 void WebContentsViewAndroid::TakeFocus(bool reverse) { 214 void WebContentsViewAndroid::TakeFocus(bool reverse) {
212 if (web_contents_->GetDelegate() && 215 if (web_contents_->GetDelegate() &&
213 web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse)) 216 web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
214 return; 217 return;
215 web_contents_->GetRenderWidgetHostView()->Focus(); 218 web_contents_->GetRenderWidgetHostView()->Focus();
216 } 219 }
217 220
218 } // namespace content 221 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_android.h ('k') | content/browser/web_contents/web_contents_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698