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

Side by Side Diff: components/exo/wayland/server.cc

Issue 2047373002: Moves ShellObserver to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « components/arc/window_manager/arc_window_manager_bridge.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/exo/wayland/server.h" 5 #include "components/exo/wayland/server.h"
6 6
7 #include <grp.h> 7 #include <grp.h>
8 #include <linux/input.h> 8 #include <linux/input.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 #include <stdint.h> 10 #include <stdint.h>
11 #include <viewporter-server-protocol.h> 11 #include <viewporter-server-protocol.h>
12 #include <wayland-server-core.h> 12 #include <wayland-server-core.h>
13 #include <wayland-server-protocol-core.h> 13 #include <wayland-server-protocol-core.h>
14 14
15 // Note: core wayland headers need to be included before protocol headers. 15 // Note: core wayland headers need to be included before protocol headers.
16 #include <alpha-compositing-unstable-v1-server-protocol.h> // NOLINT 16 #include <alpha-compositing-unstable-v1-server-protocol.h> // NOLINT
17 #include <remote-shell-unstable-v1-server-protocol.h> // NOLINT 17 #include <remote-shell-unstable-v1-server-protocol.h> // NOLINT
18 #include <secure-output-unstable-v1-server-protocol.h> // NOLINT 18 #include <secure-output-unstable-v1-server-protocol.h> // NOLINT
19 #include <xdg-shell-unstable-v5-server-protocol.h> // NOLINT 19 #include <xdg-shell-unstable-v5-server-protocol.h> // NOLINT
20 20
21 #include <algorithm> 21 #include <algorithm>
22 #include <iterator> 22 #include <iterator>
23 #include <string> 23 #include <string>
24 #include <utility> 24 #include <utility>
25 25
26 #include "ash/common/shell_observer.h"
26 #include "ash/common/shell_window_ids.h" 27 #include "ash/common/shell_window_ids.h"
27 #include "ash/display/display_info.h" 28 #include "ash/display/display_info.h"
28 #include "ash/display/display_manager.h" 29 #include "ash/display/display_manager.h"
29 #include "ash/shell.h" 30 #include "ash/shell.h"
30 #include "ash/shell_observer.h"
31 #include "base/bind.h" 31 #include "base/bind.h"
32 #include "base/cancelable_callback.h" 32 #include "base/cancelable_callback.h"
33 #include "base/files/file_path.h" 33 #include "base/files/file_path.h"
34 #include "base/macros.h" 34 #include "base/macros.h"
35 #include "base/memory/free_deleter.h" 35 #include "base/memory/free_deleter.h"
36 #include "base/memory/ptr_util.h" 36 #include "base/memory/ptr_util.h"
37 #include "base/strings/stringprintf.h" 37 #include "base/strings/stringprintf.h"
38 #include "base/strings/utf_string_conversions.h" 38 #include "base/strings/utf_string_conversions.h"
39 #include "components/exo/buffer.h" 39 #include "components/exo/buffer.h"
40 #include "components/exo/display.h" 40 #include "components/exo/display.h"
(...skipping 2527 matching lines...) Expand 10 before | Expand all | Expand 10 after
2568 DCHECK(event_loop); 2568 DCHECK(event_loop);
2569 wl_event_loop_dispatch(event_loop, timeout.InMilliseconds()); 2569 wl_event_loop_dispatch(event_loop, timeout.InMilliseconds());
2570 } 2570 }
2571 2571
2572 void Server::Flush() { 2572 void Server::Flush() {
2573 wl_display_flush_clients(wl_display_.get()); 2573 wl_display_flush_clients(wl_display_.get());
2574 } 2574 }
2575 2575
2576 } // namespace wayland 2576 } // namespace wayland
2577 } // namespace exo 2577 } // namespace exo
OLDNEW
« no previous file with comments | « components/arc/window_manager/arc_window_manager_bridge.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698