services/ui/ws/platform_display.cc - Issue 2419723002: Move services/shell to services/service_manager

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)

Patch Set: rebase Created 4 years, 2 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 | « services/ui/ws/gpu_service_proxy.cc ('k') | services/ui/ws/test_utils.cc » ('j') | no next file with comments »

OLD	NEW
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/numerics/safe_conversions.h"	7 #include "base/numerics/safe_conversions.h"

8 #include "build/build_config.h"	8 #include "build/build_config.h"

9 #include "cc/ipc/quads.mojom.h"	9 #include "cc/ipc/quads.mojom.h"

10 #include "cc/output/copy_output_request.h"	10 #include "cc/output/copy_output_request.h"

11 #include "cc/output/delegated_frame_data.h"	11 #include "cc/output/delegated_frame_data.h"

12 #include "gpu/ipc/client/gpu_channel_host.h"	12 #include "gpu/ipc/client/gpu_channel_host.h"

13 #include "services/shell/public/cpp/connection.h"	13 #include "services/service_manager/public/cpp/connection.h"

14 #include "services/shell/public/cpp/connector.h"	14 #include "services/service_manager/public/cpp/connector.h"

15 #include "services/ui/display/platform_screen.h"	15 #include "services/ui/display/platform_screen.h"

16 #include "services/ui/surfaces/compositor_frame_sink.h"	16 #include "services/ui/surfaces/compositor_frame_sink.h"

17 #include "services/ui/surfaces/display_compositor.h"	17 #include "services/ui/surfaces/display_compositor.h"

18 #include "services/ui/ws/platform_display_factory.h"	18 #include "services/ui/ws/platform_display_factory.h"

19 #include "services/ui/ws/platform_display_init_params.h"	19 #include "services/ui/ws/platform_display_init_params.h"

20 #include "services/ui/ws/server_window.h"	20 #include "services/ui/ws/server_window.h"

21 #include "services/ui/ws/window_coordinate_conversions.h"	21 #include "services/ui/ws/window_coordinate_conversions.h"

22 #include "third_party/skia/include/core/SkXfermode.h"	22 #include "third_party/skia/include/core/SkXfermode.h"

23 #include "ui/base/cursor/cursor_loader.h"	23 #include "ui/base/cursor/cursor_loader.h"

24 #include "ui/display/display.h"	24 #include "ui/display/display.h"

(...skipping 277 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
302 return delegate_ ? delegate_->IsInHighContrastMode() : false;	302 return delegate_ ? delegate_->IsInHighContrastMode() : false;

303 }	303 }

304	304

305 const ViewportMetrics& DefaultPlatformDisplay::GetViewportMetrics() {	305 const ViewportMetrics& DefaultPlatformDisplay::GetViewportMetrics() {

306 return metrics_;	306 return metrics_;

307 }	307 }

308	308

309 } // namespace ws	309 } // namespace ws

310	310

311 } // namespace ui	311 } // namespace ui

OLD	NEW