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

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

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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/ozone/platform/wayland/ozone_platform_wayland.cc ('k') | ui/ozone/public/ozone_platform.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
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); 80 event_source_.get(), window_manager_.get(), delegate);
81 window->SetBounds(bounds); 81 window->SetBounds(bounds);
82 window->Create(); 82 window->Create();
83 window->SetTitle(base::ASCIIToUTF16("Ozone X11")); 83 window->SetTitle(base::ASCIIToUTF16("Ozone X11"));
84 return std::move(window); 84 return std::move(window);
85 } 85 }
86 86
87 std::unique_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() 87 std::unique_ptr<display::NativeDisplayDelegate> CreateNativeDisplayDelegate()
88 override { 88 override {
89 return base::MakeUnique<display::FakeDisplayDelegate>(); 89 return base::MakeUnique<display::FakeDisplayDelegate>();
90 } 90 }
91 91
92 void InitializeUI() override { 92 void InitializeUI() override {
93 window_manager_.reset(new X11WindowManagerOzone); 93 window_manager_.reset(new X11WindowManagerOzone);
94 if (!event_source_) 94 if (!event_source_)
95 event_source_.reset(new X11EventSourceLibevent(gfx::GetXDisplay())); 95 event_source_.reset(new X11EventSourceLibevent(gfx::GetXDisplay()));
96 overlay_manager_.reset(new StubOverlayManager()); 96 overlay_manager_.reset(new StubOverlayManager());
97 input_controller_ = CreateStubInputController(); 97 input_controller_ = CreateStubInputController();
(...skipping 24 matching lines...) Expand all
122 DISALLOW_COPY_AND_ASSIGN(OzonePlatformX11); 122 DISALLOW_COPY_AND_ASSIGN(OzonePlatformX11);
123 }; 123 };
124 124
125 } // namespace 125 } // namespace
126 126
127 OzonePlatform* CreateOzonePlatformX11() { 127 OzonePlatform* CreateOzonePlatformX11() {
128 return new OzonePlatformX11; 128 return new OzonePlatformX11;
129 } 129 }
130 130
131 } // namespace ui 131 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/wayland/ozone_platform_wayland.cc ('k') | ui/ozone/public/ozone_platform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698