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

Side by Side Diff: chrome/browser/ui/tabs/dock_info_aura.cc

Issue 10083057: Revert 132856 - Aura/ash split: Remove hacks and get chrome linking without ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 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 "chrome/browser/ui/tabs/dock_info.h" 5 #include "chrome/browser/ui/tabs/dock_info.h"
6 6
7 #include "ash/shell.h"
8 #include "ui/aura/root_window.h"
7 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/gfx/compositor/layer.h"
8 11
9 #if !defined(USE_ASH) 12 // DockInfo -------------------------------------------------------------------
13
14 namespace {
15
16 aura::Window* GetLocalProcessWindowAtPointImpl(
17 const gfx::Point& screen_point,
18 const std::set<gfx::NativeView>& ignore,
19 aura::Window* window) {
20 if (ignore.find(window) != ignore.end())
21 return NULL;
22
23 if (!window->IsVisible())
24 return NULL;
25
26 if (window->layer()->type() == ui::LAYER_TEXTURED) {
27 gfx::Point window_point(screen_point);
28 aura::Window::ConvertPointToWindow(ash::Shell::GetRootWindow(), window,
29 &window_point);
30 return gfx::Rect(window->bounds().size()).Contains(window_point) ?
31 window : NULL;
32 }
33 for (aura::Window::Windows::const_reverse_iterator i =
34 window->children().rbegin(); i != window->children().rend(); ++i) {
35 aura::Window* result =
36 GetLocalProcessWindowAtPointImpl(screen_point, ignore, *i);
37 if (result)
38 return result;
39 }
40 return NULL;
41 }
42
43 } // namespace
10 44
11 // static 45 // static
12 DockInfo DockInfo::GetDockInfoAtPoint(const gfx::Point& screen_point, 46 DockInfo DockInfo::GetDockInfoAtPoint(const gfx::Point& screen_point,
13 const std::set<gfx::NativeView>& ignore) { 47 const std::set<gfx::NativeView>& ignore) {
14 // TODO(beng): 48 // TODO(beng):
15 NOTIMPLEMENTED(); 49 NOTIMPLEMENTED();
16 return DockInfo(); 50 return DockInfo();
17 } 51 }
18 52
19 // static 53 // static
20 gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint( 54 gfx::NativeView DockInfo::GetLocalProcessWindowAtPoint(
21 const gfx::Point& screen_point, 55 const gfx::Point& screen_point,
22 const std::set<gfx::NativeView>& ignore) { 56 const std::set<gfx::NativeView>& ignore) {
23 NOTIMPLEMENTED(); 57 return GetLocalProcessWindowAtPointImpl(
24 return NULL; 58 screen_point, ignore, ash::Shell::GetRootWindow());
25 } 59 }
26 60
27 bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const { 61 bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const {
28 if (!window()) 62 if (!window())
29 return false; 63 return false;
30 *bounds = window_->bounds(); 64 *bounds = window_->bounds();
31 return true; 65 return true;
32 } 66 }
33 67
34 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const { 68 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const {
35 window_->SetBounds(bounds); 69 window_->SetBounds(bounds);
36 } 70 }
37
38 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/tabs/dock_info_ash.cc ('k') | chrome/browser/ui/views/accessibility_event_router_views_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698