chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc - Issue 9473001: Extract minimal RenderViewHost interface for embedders, leaving

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc

Issue 9473001: Extract minimal RenderViewHost interface for embedders, leaving (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to LKGR. Created 8 years, 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/notifications/balloon_view_host.cc ('k') | chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc

diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc

index 7a889914d3f150e7478332b6b41c527a882f7500..3ee1a275447a2b76a21e86087c29445b00400c80 100644

--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc

+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc

@@ -60,7 +60,7 @@ class WebDragSourceAura : public MessageLoopForUI::Observer {

if (rvh) {

gfx::Point screen_loc = ui::EventLocationFromNative(event);

gfx::Point client_loc = screen_loc;

- aura::Window* window = rvh->view()->GetNativeView();

+ aura::Window* window = rvh->GetView()->GetNativeView();

aura::Window::ConvertPointToWindow(window->GetRootWindow(),

window, &client_loc);

rvh->DragSourceMovedTo(client_loc.x(), client_loc.y(),

@@ -329,7 +329,7 @@ void NativeTabContentsViewAura::EndDrag(WebKit::WebDragOperationsMask ops) {

gfx::Point screen_loc = root_window->last_mouse_location();

gfx::Point client_loc = screen_loc;

RenderViewHost* rvh = GetWebContents()->GetRenderViewHost();

- aura::Window* window = rvh->view()->GetNativeView();

+ aura::Window* window = rvh->GetView()->GetNativeView();

aura::Window::ConvertPointToWindow(root_window, window, &client_loc);

rvh->DragSourceEndedAt(client_loc.x(), client_loc.y(), screen_loc.x(),

screen_loc.y(), ops);