chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc - Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow.

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/chrome_web_contents_view_delegate_views.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 2 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/frame/app_non_client_frame_view_ash_browsertest.cc ('k') | chrome/browser/ui/views/tabs/dock_info_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 04dc7b8f7ce2712abd7e94d21f39cadc219919ab..47a0ebdc4b2be8b93d19c727cd2418083a0dce7a 100644

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

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

@@ -24,7 +24,6 @@

#if defined(USE_AURA)

#include "chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h"

#include "ui/aura/client/screen_position_client.h"

-#include "ui/aura/root_window.h"

#include "ui/aura/window.h"

#else

#include "chrome/browser/ui/views/tab_contents/web_drag_bookmark_handler_win.h"

@@ -150,7 +149,7 @@ void ChromeWebContentsViewDelegateViews::ShowContextMenu(

// Convert from content coordinates to window coordinates.

aura::Window* web_contents_window =

web_contents_->GetView()->GetNativeView();

- aura::RootWindow* root_window = web_contents_window->GetRootWindow();

+ aura::Window* root_window = web_contents_window->GetRootWindow();

aura::client::ScreenPositionClient* screen_position_client =

aura::client::GetScreenPositionClient(root_window);

if (screen_position_client) {