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

Side by Side Diff: ash/display/mirror_window_controller.cc

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "ash/display/mirror_window_controller.h" 5 #include "ash/display/mirror_window_controller.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #if defined(USE_X11) 9 #if defined(USE_X11)
10 #include <X11/extensions/XInput2.h> 10 #include <X11/extensions/XInput2.h>
11 #include <X11/Xlib.h> 11 #include <X11/Xlib.h>
12 12
13 // Xlib.h defines RootWindow. 13 // Xlib.h defines RootWindow.
14 #undef RootWindow 14 #undef RootWindow
15 #endif 15 #endif
16 16
17 #include "ash/common/display/display_info.h"
17 #include "ash/display/cursor_window_controller.h" 18 #include "ash/display/cursor_window_controller.h"
18 #include "ash/display/display_info.h"
19 #include "ash/display/display_manager.h" 19 #include "ash/display/display_manager.h"
20 #include "ash/display/root_window_transformers.h" 20 #include "ash/display/root_window_transformers.h"
21 #include "ash/display/screen_position_controller.h" 21 #include "ash/display/screen_position_controller.h"
22 #include "ash/display/window_tree_host_manager.h" 22 #include "ash/display/window_tree_host_manager.h"
23 #include "ash/host/ash_window_tree_host.h" 23 #include "ash/host/ash_window_tree_host.h"
24 #include "ash/host/ash_window_tree_host_init_params.h" 24 #include "ash/host/ash_window_tree_host_init_params.h"
25 #include "ash/host/root_window_transformer.h" 25 #include "ash/host/root_window_transformer.h"
26 #include "ash/root_window_settings.h" 26 #include "ash/root_window_settings.h"
27 #include "ash/shell.h" 27 #include "ash/shell.h"
28 #include "base/strings/stringprintf.h" 28 #include "base/strings/stringprintf.h"
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 // EventProcessor may be accessed after this call if the mirroring window 383 // EventProcessor may be accessed after this call if the mirroring window
384 // was deleted as a result of input event (e.g. shortcut), so don't delete 384 // was deleted as a result of input event (e.g. shortcut), so don't delete
385 // now. 385 // now.
386 if (delay_host_deletion) 386 if (delay_host_deletion)
387 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, host_info); 387 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, host_info);
388 else 388 else
389 delete host_info; 389 delete host_info;
390 } 390 }
391 391
392 } // namespace ash 392 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/event_transformation_handler.cc ('k') | ash/display/resolution_notification_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698