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

Side by Side Diff: ui/ozone/platform/headless/ozone_platform_headless.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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/headless/ozone_platform_headless.h" 5 #include "ui/ozone/platform/headless/ozone_platform_headless.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 } 65 }
66 std::unique_ptr<SystemInputInjector> CreateSystemInputInjector() override { 66 std::unique_ptr<SystemInputInjector> CreateSystemInputInjector() override {
67 return nullptr; // no input injection support. 67 return nullptr; // no input injection support.
68 } 68 }
69 std::unique_ptr<PlatformWindow> CreatePlatformWindow( 69 std::unique_ptr<PlatformWindow> CreatePlatformWindow(
70 PlatformWindowDelegate* delegate, 70 PlatformWindowDelegate* delegate,
71 const gfx::Rect& bounds) override { 71 const gfx::Rect& bounds) override {
72 return base::WrapUnique<PlatformWindow>( 72 return base::WrapUnique<PlatformWindow>(
73 new HeadlessWindow(delegate, window_manager_.get(), bounds)); 73 new HeadlessWindow(delegate, window_manager_.get(), bounds));
74 } 74 }
75 std::unique_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() 75 std::unique_ptr<display::NativeDisplayDelegate> CreateNativeDisplayDelegate()
76 override { 76 override {
77 return base::MakeUnique<display::FakeDisplayDelegate>(); 77 return base::MakeUnique<display::FakeDisplayDelegate>();
78 } 78 }
79 79
80 void InitializeUI() override { 80 void InitializeUI() override {
81 window_manager_.reset(new HeadlessWindowManager(file_path_)); 81 window_manager_.reset(new HeadlessWindowManager(file_path_));
82 window_manager_->Initialize(); 82 window_manager_->Initialize();
83 surface_factory_.reset(new HeadlessSurfaceFactory(window_manager_.get())); 83 surface_factory_.reset(new HeadlessSurfaceFactory(window_manager_.get()));
84 // This unbreaks tests that create their own. 84 // This unbreaks tests that create their own.
85 if (!PlatformEventSource::GetInstance()) 85 if (!PlatformEventSource::GetInstance())
(...skipping 29 matching lines...) Expand all
115 115
116 OzonePlatform* CreateOzonePlatformHeadless() { 116 OzonePlatform* CreateOzonePlatformHeadless() {
117 base::CommandLine* cmd = base::CommandLine::ForCurrentProcess(); 117 base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
118 base::FilePath location; 118 base::FilePath location;
119 if (cmd->HasSwitch(switches::kOzoneDumpFile)) 119 if (cmd->HasSwitch(switches::kOzoneDumpFile))
120 location = cmd->GetSwitchValuePath(switches::kOzoneDumpFile); 120 location = cmd->GetSwitchValuePath(switches::kOzoneDumpFile);
121 return new OzonePlatformHeadless(location); 121 return new OzonePlatformHeadless(location);
122 } 122 }
123 123
124 } // namespace ui 124 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/drm/ozone_platform_gbm.cc ('k') | ui/ozone/platform/wayland/ozone_platform_wayland.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698