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

Side by Side Diff: services/ui/ws/platform_display.cc

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Undo Screen TLS change, don't use Screen::GetScreen() in Mus. Created 3 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "services/ui/ws/platform_display.h" 5 #include "services/ui/ws/platform_display.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "services/ui/ws/platform_display_default.h" 8 #include "services/ui/ws/platform_display_default.h"
9 #include "services/ui/ws/platform_display_factory.h" 9 #include "services/ui/ws/platform_display_factory.h"
10 #include "services/ui/ws/server_window.h" 10 #include "services/ui/ws/server_window.h"
11 #include "ui/base/cursor/image_cursors.h" 11 #include "services/ui/ws/threaded_image_cursors.h"
12 12
13 namespace ui { 13 namespace ui {
14 namespace ws { 14 namespace ws {
15 15
16 // static 16 // static
17 PlatformDisplayFactory* PlatformDisplay::factory_ = nullptr; 17 PlatformDisplayFactory* PlatformDisplay::factory_ = nullptr;
18 18
19 // static 19 // static
20 std::unique_ptr<PlatformDisplay> PlatformDisplay::Create( 20 std::unique_ptr<PlatformDisplay> PlatformDisplay::Create(
21 ServerWindow* root, 21 ServerWindow* root,
22 const display::ViewportMetrics& metrics) { 22 const display::ViewportMetrics& metrics,
23 scoped_refptr<base::SingleThreadTaskRunner>& resource_runner,
24 base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr) {
23 if (factory_) 25 if (factory_)
24 return factory_->CreatePlatformDisplay(root, metrics); 26 return factory_->CreatePlatformDisplay(root, metrics);
25 27
26 #if defined(OS_ANDROID) 28 #if defined(OS_ANDROID)
27 return base::MakeUnique<PlatformDisplayDefault>(root, metrics, 29 return base::MakeUnique<PlatformDisplayDefault>(root, metrics,
28 nullptr /* image_cursors */); 30 nullptr /* image_cursors */);
29 #else 31 #else
30 return base::MakeUnique<PlatformDisplayDefault>( 32 return base::MakeUnique<PlatformDisplayDefault>(
31 root, metrics, base::MakeUnique<ImageCursors>()); 33 root, metrics,
34 base::MakeUnique<ThreadedImageCursors>(resource_runner,
35 image_cursors_weak_ptr));
32 #endif 36 #endif
33 } 37 }
34 38
35 } // namespace ws 39 } // namespace ws
36 } // namespace ui 40 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698