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

Side by Side Diff: ui/ozone/platform/x11/ozone_platform_x11.cc

Issue 2741533002: Fix AshWindowTreeHost shutdown for Ozone X11. (Closed)
Patch Set: Add to other PlatformWindow implementations. Created 3 years, 9 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/ozone/platform/x11/ozone_platform_x11.h" 5 #include "ui/ozone/platform/x11/ozone_platform_x11.h"
6 6
7 #include <X11/Xlib.h> 7 #include <X11/Xlib.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 } 70 }
71 71
72 GpuPlatformSupportHost* GetGpuPlatformSupportHost() override { 72 GpuPlatformSupportHost* GetGpuPlatformSupportHost() override {
73 return gpu_platform_support_host_.get(); 73 return gpu_platform_support_host_.get();
74 } 74 }
75 75
76 std::unique_ptr<PlatformWindow> CreatePlatformWindow( 76 std::unique_ptr<PlatformWindow> CreatePlatformWindow(
77 PlatformWindowDelegate* delegate, 77 PlatformWindowDelegate* delegate,
78 const gfx::Rect& bounds) override { 78 const gfx::Rect& bounds) override {
79 std::unique_ptr<X11WindowOzone> window = base::MakeUnique<X11WindowOzone>( 79 std::unique_ptr<X11WindowOzone> window = base::MakeUnique<X11WindowOzone>(
80 event_source_.get(), window_manager_.get(), delegate, bounds); 80 window_manager_.get(), delegate, bounds);
81 window->Create(); 81 window->Create();
82 window->SetTitle(base::ASCIIToUTF16("Ozone X11")); 82 window->SetTitle(base::ASCIIToUTF16("Ozone X11"));
83 return std::move(window); 83 return std::move(window);
84 } 84 }
85 85
86 std::unique_ptr<display::NativeDisplayDelegate> CreateNativeDisplayDelegate() 86 std::unique_ptr<display::NativeDisplayDelegate> CreateNativeDisplayDelegate()
87 override { 87 override {
88 return base::MakeUnique<display::FakeDisplayDelegate>(); 88 return base::MakeUnique<display::FakeDisplayDelegate>();
89 } 89 }
90 90
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 DISALLOW_COPY_AND_ASSIGN(OzonePlatformX11); 127 DISALLOW_COPY_AND_ASSIGN(OzonePlatformX11);
128 }; 128 };
129 129
130 } // namespace 130 } // namespace
131 131
132 OzonePlatform* CreateOzonePlatformX11() { 132 OzonePlatform* CreateOzonePlatformX11() {
133 return new OzonePlatformX11; 133 return new OzonePlatformX11;
134 } 134 }
135 135
136 } // namespace ui 136 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/wayland/wayland_window.cc ('k') | ui/platform_window/android/platform_window_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698