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

Side by Side Diff: chrome/browser/ui/aura/tabs/dock_info_aurax11.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, 1 month 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 "chrome/browser/ui/host_desktop.h" 7 #include "chrome/browser/ui/host_desktop.h"
8 #include "ui/aura/root_window.h" 8 #include "ui/aura/root_window.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/base/x/x11_util.h" 10 #include "ui/base/x/x11_util.h"
11 11
12 #if !defined(OS_CHROMEOS) 12 #if !defined(OS_CHROMEOS)
13 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h" 13 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h"
14 #endif 14 #endif
15 15
16 #if !defined(OS_CHROMEOS) 16 #if !defined(OS_CHROMEOS)
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)->GetRootWindow()->GetAcceleratedWidget(); 30 XID xid = (*iter)->GetDispatcher()->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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 return false; 201 return false;
202 *bounds = window_->bounds(); 202 *bounds = window_->bounds();
203 return true; 203 return true;
204 } 204 }
205 205
206 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const { 206 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const {
207 window_->SetBounds(bounds); 207 window_->SetBounds(bounds);
208 } 208 }
209 209
210 #endif 210 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/screenshot_taker.cc ('k') | chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698