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

Side by Side Diff: ui/views/widget/desktop_aura/x11_desktop_window_move_client.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 "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h" 5 #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h"
6 6
7 #include <X11/Xlib.h> 7 #include <X11/Xlib.h>
8 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. 8 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
9 #undef RootWindow 9 #undef RootWindow
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 } 43 }
44 44
45 //////////////////////////////////////////////////////////////////////////////// 45 ////////////////////////////////////////////////////////////////////////////////
46 // DesktopRootWindowHostLinux, aura::client::WindowMoveClient implementation: 46 // DesktopRootWindowHostLinux, aura::client::WindowMoveClient implementation:
47 47
48 aura::client::WindowMoveResult X11DesktopWindowMoveClient::RunMoveLoop( 48 aura::client::WindowMoveResult X11DesktopWindowMoveClient::RunMoveLoop(
49 aura::Window* source, 49 aura::Window* source,
50 const gfx::Vector2d& drag_offset, 50 const gfx::Vector2d& drag_offset,
51 aura::client::WindowMoveSource move_source) { 51 aura::client::WindowMoveSource move_source) {
52 window_offset_ = drag_offset; 52 window_offset_ = drag_offset;
53 root_window_ = source->GetRootWindow(); 53 root_window_ = source->GetDispatcher();
54 54
55 bool success = move_loop_.RunMoveLoop(source, root_window_->last_cursor()); 55 bool success = move_loop_.RunMoveLoop(source, root_window_->last_cursor());
56 return success ? aura::client::MOVE_SUCCESSFUL : aura::client::MOVE_CANCELED; 56 return success ? aura::client::MOVE_SUCCESSFUL : aura::client::MOVE_CANCELED;
57 } 57 }
58 58
59 void X11DesktopWindowMoveClient::EndMoveLoop() { 59 void X11DesktopWindowMoveClient::EndMoveLoop() {
60 move_loop_.EndMoveLoop(); 60 move_loop_.EndMoveLoop();
61 } 61 }
62 62
63 } // namespace views 63 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_screen_x11.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698