chrome/browser/ui/tabs/dock_info_ash.cc - Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow()

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/tabs/dock_info_ash.cc

Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: git-try -b linux_chromeos,win_aura Created 8 years, 7 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:

Index: chrome/browser/ui/tabs/dock_info_ash.cc

diff --git a/chrome/browser/ui/tabs/dock_info_ash.cc b/chrome/browser/ui/tabs/dock_info_ash.cc

index 598a1751240480207ce4076a2f5495536bb81d89..e5208c1e907a4b8da20eb635549612f35f444fcd 100644

--- a/chrome/browser/ui/tabs/dock_info_ash.cc

+++ b/chrome/browser/ui/tabs/dock_info_ash.cc

@@ -25,7 +25,8 @@ aura::Window* GetLocalProcessWindowAtPointImpl(

if (window->layer()->type() == ui::LAYER_TEXTURED) {

gfx::Point window_point(screen_point);

- aura::Window::ConvertPointToWindow(ash::Shell::GetRootWindow(), window,

+ aura::Window::ConvertPointToWindow(ash::Shell::GetPrimaryRootWindow(),

+ window,

&window_point);

return gfx::Rect(window->bounds().size()).Contains(window_point) ?

window : NULL;

@@ -55,7 +56,7 @@ gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint(

const gfx::Point& screen_point,

const std::set<gfx::NativeView>& ignore) {

return GetLocalProcessWindowAtPointImpl(

- screen_point, ignore, ash::Shell::GetRootWindow());

+ screen_point, ignore, ash::Shell::GetPrimaryRootWindow());

}

bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const {

« no previous file with comments | « chrome/browser/fullscreen_ash.cc ('k') | chrome/browser/ui/views/ash/key_rewriter.cc » ('j') | no next file with comments »