diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 07:21:08 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 07:21:08 +0000 |
commit | e43cc327407f7a2f05d9d9a03f9366b02b5e8da4 (patch) | |
tree | 66d355af54d2940cfcc4dec36e9607b10822ecb8 /ui | |
parent | 22b3b34900fb38a017715ac0cc3c6bda4c54c6f9 (diff) | |
download | chromium_src-e43cc327407f7a2f05d9d9a03f9366b02b5e8da4.zip chromium_src-e43cc327407f7a2f05d9d9a03f9366b02b5e8da4.tar.gz chromium_src-e43cc327407f7a2f05d9d9a03f9366b02b5e8da4.tar.bz2 |
Revert 234433 "fix bustage"
> fix bustage
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/70033002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r-- | ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc | 24 | ||||
-rw-r--r-- | ui/views/widget/desktop_aura/x11_window_event_filter.cc | 1 |
2 files changed, 11 insertions, 14 deletions
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc index 12cd8d3..af9571b 100644 --- a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc +++ b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc @@ -20,7 +20,6 @@ #include "ui/aura/client/focus_client.h" #include "ui/aura/client/user_action_client.h" #include "ui/aura/root_window.h" -#include "ui/aura/window.h" #include "ui/aura/window_property.h" #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" #include "ui/base/x/x11_util.h" @@ -133,21 +132,21 @@ DesktopRootWindowHostX11::DesktopRootWindowHostX11( } DesktopRootWindowHostX11::~DesktopRootWindowHostX11() { - root_window_->window()->ClearProperty(kHostForRootWindow); - aura::client::SetWindowMoveClient(root_window_->window(), NULL); + root_window_->ClearProperty(kHostForRootWindow); + aura::client::SetWindowMoveClient(root_window_, NULL); desktop_native_widget_aura_->OnDesktopRootWindowHostDestroyed(root_window_); } // static aura::Window* DesktopRootWindowHostX11::GetContentWindowForXID(XID xid) { aura::RootWindow* root = aura::RootWindow::GetForAcceleratedWidget(xid); - return root ? root->window()->GetProperty(kViewsWindowForRootWindow) : NULL; + return root ? root->GetProperty(kViewsWindowForRootWindow) : NULL; } // static DesktopRootWindowHostX11* DesktopRootWindowHostX11::GetHostForXID(XID xid) { aura::RootWindow* root = aura::RootWindow::GetForAcceleratedWidget(xid); - return root ? root->window()->GetProperty(kHostForRootWindow) : NULL; + return root ? root->GetProperty(kHostForRootWindow) : NULL; } // static @@ -220,9 +219,8 @@ void DesktopRootWindowHostX11::OnRootWindowCreated( const Widget::InitParams& params) { root_window_ = root; - root_window_->window()->SetProperty(kViewsWindowForRootWindow, - content_window_); - root_window_->window()->SetProperty(kHostForRootWindow, this); + root_window_->SetProperty(kViewsWindowForRootWindow, content_window_); + root_window_->SetProperty(kHostForRootWindow, this); root_window_host_delegate_ = root_window_; // If we're given a parent, we need to mark ourselves as transient to another @@ -242,7 +240,7 @@ void DesktopRootWindowHostX11::OnRootWindowCreated( x11_window_event_filter_.get()); x11_window_move_client_.reset(new X11DesktopWindowMoveClient); - aura::client::SetWindowMoveClient(root_window_->window(), + aura::client::SetWindowMoveClient(root_window_, x11_window_move_client_.get()); native_widget_delegate_->OnNativeWidgetCreated(true); @@ -257,7 +255,7 @@ scoped_ptr<aura::client::DragDropClient> DesktopRootWindowHostX11::CreateDragDropClient( DesktopNativeCursorManager* cursor_manager) { drag_drop_client_ = new DesktopDragDropClientAuraX11( - root_window_->window(), cursor_manager, xdisplay_, xwindow_); + root_window_, cursor_manager, xdisplay_, xwindow_); return scoped_ptr<aura::client::DragDropClient>(drag_drop_client_).Pass(); } @@ -1058,7 +1056,7 @@ void DesktopRootWindowHostX11::DispatchMouseEvent(ui::MouseEvent* event) { } else { // Another DesktopRootWindowHostX11 has installed itself as // capture. Translate the event's location and dispatch to the other. - event->ConvertLocationToTarget(root_window_->window(), + event->ConvertLocationToTarget(root_window_, g_current_capture->root_window_); g_current_capture->root_window_host_delegate_->OnHostMouseEvent(event); } @@ -1134,7 +1132,7 @@ bool DesktopRootWindowHostX11::Dispatch(const base::NativeEvent& event) { if (static_cast<int>(xev->xbutton.button) == kBackMouseButton || static_cast<int>(xev->xbutton.button) == kForwardMouseButton) { aura::client::UserActionClient* gesture_client = - aura::client::GetUserActionClient(root_window_->window()); + aura::client::GetUserActionClient(root_window_); if (gesture_client) { gesture_client->OnUserAction( static_cast<int>(xev->xbutton.button) == kBackMouseButton ? @@ -1223,7 +1221,7 @@ bool DesktopRootWindowHostX11::Dispatch(const base::NativeEvent& event) { if (button == kBackMouseButton || button == kForwardMouseButton) { aura::client::UserActionClient* gesture_client = aura::client::GetUserActionClient( - root_window_host_delegate_->AsRootWindow()->window()); + root_window_host_delegate_->AsRootWindow()); if (gesture_client) { bool reverse_direction = ui::IsTouchpadEvent(xev) && ui::IsNaturalScrollEnabled(); diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.cc b/ui/views/widget/desktop_aura/x11_window_event_filter.cc index e340bdb..740e120 100644 --- a/ui/views/widget/desktop_aura/x11_window_event_filter.cc +++ b/ui/views/widget/desktop_aura/x11_window_event_filter.cc @@ -10,7 +10,6 @@ #include <X11/Xlib.h> #include "ui/aura/root_window.h" -#include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/base/hit_test.h" #include "ui/events/event.h" |