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

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

Issue 2576533003: Converts some services to use aura-mus (Closed)
Patch Set: remove log Created 4 years 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_window_tree_host_x11.h ('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_window_tree_host_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_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 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 !params.remove_standard_frame); 471 !params.remove_standard_frame);
472 472
473 x11_window_move_client_.reset(new X11DesktopWindowMoveClient); 473 x11_window_move_client_.reset(new X11DesktopWindowMoveClient);
474 aura::client::SetWindowMoveClient(window(), x11_window_move_client_.get()); 474 aura::client::SetWindowMoveClient(window(), x11_window_move_client_.get());
475 475
476 SetWindowTransparency(); 476 SetWindowTransparency();
477 477
478 native_widget_delegate_->OnNativeWidgetCreated(true); 478 native_widget_delegate_->OnNativeWidgetCreated(true);
479 } 479 }
480 480
481 void DesktopWindowTreeHostX11::OnWidgetInitDone() {}
482
481 std::unique_ptr<corewm::Tooltip> DesktopWindowTreeHostX11::CreateTooltip() { 483 std::unique_ptr<corewm::Tooltip> DesktopWindowTreeHostX11::CreateTooltip() {
482 return base::WrapUnique(new corewm::TooltipAura); 484 return base::WrapUnique(new corewm::TooltipAura);
483 } 485 }
484 486
485 std::unique_ptr<aura::client::DragDropClient> 487 std::unique_ptr<aura::client::DragDropClient>
486 DesktopWindowTreeHostX11::CreateDragDropClient( 488 DesktopWindowTreeHostX11::CreateDragDropClient(
487 DesktopNativeCursorManager* cursor_manager) { 489 DesktopNativeCursorManager* cursor_manager) {
488 drag_drop_client_ = new DesktopDragDropClientAuraX11( 490 drag_drop_client_ = new DesktopDragDropClientAuraX11(
489 window(), cursor_manager, xdisplay_, xwindow_); 491 window(), cursor_manager, xdisplay_, xwindow_);
490 drag_drop_client_->Init(); 492 drag_drop_client_->Init();
(...skipping 1849 matching lines...) Expand 10 before | Expand all | Expand 10 after
2340 2342
2341 // static 2343 // static
2342 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( 2344 DesktopWindowTreeHost* DesktopWindowTreeHost::Create(
2343 internal::NativeWidgetDelegate* native_widget_delegate, 2345 internal::NativeWidgetDelegate* native_widget_delegate,
2344 DesktopNativeWidgetAura* desktop_native_widget_aura) { 2346 DesktopNativeWidgetAura* desktop_native_widget_aura) {
2345 return new DesktopWindowTreeHostX11(native_widget_delegate, 2347 return new DesktopWindowTreeHostX11(native_widget_delegate,
2346 desktop_native_widget_aura); 2348 desktop_native_widget_aura);
2347 } 2349 }
2348 2350
2349 } // namespace views 2351 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698