diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 00:41:50 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 00:41:50 +0000 |
| commit | 42713f747e45ec2d4d754f449ba8a0edf5deffe6 (patch) | |
| tree | a278abbd3cf1496c36793168ab27a0d43eb6cd55 /chrome/browser/ui/tabs | |
| parent | 07f1c36a10e6a5dffb01ea324bc8ca8d11b9653f (diff) | |
| download | chromium_src-42713f747e45ec2d4d754f449ba8a0edf5deffe6.zip chromium_src-42713f747e45ec2d4d754f449ba8a0edf5deffe6.tar.gz chromium_src-42713f747e45ec2d4d754f449ba8a0edf5deffe6.tar.bz2 | |
Rename GetRootWindow() -> GetPrimaryRootWindow()
BUG=123160
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10442017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/tabs')
| -rw-r--r-- | chrome/browser/ui/tabs/dock_info_ash.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/tabs/dock_info_ash.cc b/chrome/browser/ui/tabs/dock_info_ash.cc index 598a175..e5208c1 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 { |