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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc

Issue 22404006: Make DesktopDragDropClientAuraX11 not depend on DesktopRootWindowHostX11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/desktop_root_window_host_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h"
6 6
7 #include <X11/extensions/shape.h> 7 #include <X11/extensions/shape.h>
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xatom.h> 9 #include <X11/Xatom.h>
10 #include <X11/Xregion.h> 10 #include <X11/Xregion.h>
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after
939 aura::client::SetCursorClient(root_window_, 939 aura::client::SetCursorClient(root_window_,
940 cursor_client_.get()); 940 cursor_client_.get());
941 941
942 position_client_.reset(new DesktopScreenPositionClient); 942 position_client_.reset(new DesktopScreenPositionClient);
943 aura::client::SetScreenPositionClient(root_window_, 943 aura::client::SetScreenPositionClient(root_window_,
944 position_client_.get()); 944 position_client_.get());
945 945
946 desktop_native_widget_aura_->InstallInputMethodEventFilter(root_window_); 946 desktop_native_widget_aura_->InstallInputMethodEventFilter(root_window_);
947 947
948 drag_drop_client_.reset(new DesktopDragDropClientAuraX11( 948 drag_drop_client_.reset(new DesktopDragDropClientAuraX11(
949 this, root_window_, desktop_native_cursor_manager, xdisplay_, xwindow_)); 949 root_window_, desktop_native_cursor_manager, xdisplay_, xwindow_));
950 aura::client::SetDragDropClient(root_window_, drag_drop_client_.get()); 950 aura::client::SetDragDropClient(root_window_, drag_drop_client_.get());
951 951
952 // TODO(erg): Unify this code once the other consumer goes away. 952 // TODO(erg): Unify this code once the other consumer goes away.
953 x11_window_event_filter_.reset( 953 x11_window_event_filter_.reset(
954 new X11WindowEventFilter(root_window_, activation_client_.get())); 954 new X11WindowEventFilter(root_window_, activation_client_.get()));
955 x11_window_event_filter_->SetUseHostWindowBorders(false); 955 x11_window_event_filter_->SetUseHostWindowBorders(false);
956 desktop_native_widget_aura_->root_window_event_filter()->AddHandler( 956 desktop_native_widget_aura_->root_window_event_filter()->AddHandler(
957 x11_window_event_filter_.get()); 957 x11_window_event_filter_.get());
958 958
959 x11_window_move_client_.reset(new X11DesktopWindowMoveClient); 959 x11_window_move_client_.reset(new X11DesktopWindowMoveClient);
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
1350 if (linux_ui) { 1350 if (linux_ui) {
1351 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); 1351 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme();
1352 if (native_theme) 1352 if (native_theme)
1353 return native_theme; 1353 return native_theme;
1354 } 1354 }
1355 1355
1356 return ui::NativeTheme::instance(); 1356 return ui::NativeTheme::instance();
1357 } 1357 }
1358 1358
1359 } // namespace views 1359 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698