OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "chrome/browser/ui/host_desktop.h" | 8 #include "chrome/browser/ui/host_desktop.h" |
9 #include "ui/aura/root_window.h" | 9 #include "ui/aura/root_window.h" |
10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
11 #if defined(USE_X11) | 11 #if defined(USE_X11) |
12 #include "ui/base/x/x11_util.h" | 12 #include "ui/base/x/x11_util.h" |
13 #endif | 13 #endif |
14 | 14 |
15 #if !defined(OS_CHROMEOS) && defined(USE_X11) | 15 #if !defined(OS_CHROMEOS) && defined(USE_X11) |
16 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" | 16 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
20 //////////////////////////////////////////////////////////////////////////////// | 20 //////////////////////////////////////////////////////////////////////////////// |
21 // BaseWindowFinder | 21 // BaseWindowFinder |
22 // | 22 // |
23 // Base class used to locate a window. A subclass need only override | 23 // Base class used to locate a window. A subclass need only override |
24 // ShouldStopIterating to determine when iteration should stop. | 24 // ShouldStopIterating to determine when iteration should stop. |
25 class BaseWindowFinder : public ui::EnumerateWindowsDelegate { | 25 class BaseWindowFinder : public ui::EnumerateWindowsDelegate { |
26 public: | 26 public: |
27 explicit BaseWindowFinder(const std::set<aura::Window*>& ignore) { | 27 explicit BaseWindowFinder(const std::set<aura::Window*>& ignore) { |
28 std::set<aura::Window*>::iterator iter; | 28 std::set<aura::Window*>::iterator iter; |
29 for (iter = ignore.begin(); iter != ignore.end(); iter++) { | 29 for (iter = ignore.begin(); iter != ignore.end(); iter++) { |
30 XID xid = (*iter)->GetDispatcher()->GetAcceleratedWidget(); | 30 XID xid = (*iter)->GetDispatcher()->host()->GetAcceleratedWidget(); |
31 ignore_.insert(xid); | 31 ignore_.insert(xid); |
32 } | 32 } |
33 } | 33 } |
34 | 34 |
35 virtual ~BaseWindowFinder() {} | 35 virtual ~BaseWindowFinder() {} |
36 | 36 |
37 protected: | 37 protected: |
38 // Returns true if |window| is in the ignore list. | 38 // Returns true if |window| is in the ignore list. |
39 bool ShouldIgnoreWindow(XID window) { | 39 bool ShouldIgnoreWindow(XID window) { |
40 return (ignore_.find(window) != ignore_.end()); | 40 return (ignore_.find(window) != ignore_.end()); |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const { | 214 bool DockInfo::GetWindowBounds(gfx::Rect* bounds) const { |
215 if (!window()) | 215 if (!window()) |
216 return false; | 216 return false; |
217 *bounds = window_->bounds(); | 217 *bounds = window_->bounds(); |
218 return true; | 218 return true; |
219 } | 219 } |
220 | 220 |
221 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const { | 221 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const { |
222 window_->SetBounds(bounds); | 222 window_->SetBounds(bounds); |
223 } | 223 } |
OLD | NEW |