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

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

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « ash/display/cursor_window_controller.cc ('k') | ash/display/display_controller_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/display_controller.h" 5 #include "ash/display/display_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <map> 9 #include <map>
10 10
(...skipping 10 matching lines...) Expand all
21 #include "ash/screen_util.h" 21 #include "ash/screen_util.h"
22 #include "ash/shell.h" 22 #include "ash/shell.h"
23 #include "ash/shell_delegate.h" 23 #include "ash/shell_delegate.h"
24 #include "ash/wm/coordinate_conversion.h" 24 #include "ash/wm/coordinate_conversion.h"
25 #include "base/command_line.h" 25 #include "base/command_line.h"
26 #include "base/strings/stringprintf.h" 26 #include "base/strings/stringprintf.h"
27 #include "ui/aura/client/activation_client.h" 27 #include "ui/aura/client/activation_client.h"
28 #include "ui/aura/client/capture_client.h" 28 #include "ui/aura/client/capture_client.h"
29 #include "ui/aura/client/focus_client.h" 29 #include "ui/aura/client/focus_client.h"
30 #include "ui/aura/client/screen_position_client.h" 30 #include "ui/aura/client/screen_position_client.h"
31 #include "ui/aura/root_window.h"
32 #include "ui/aura/root_window_transformer.h" 31 #include "ui/aura/root_window_transformer.h"
33 #include "ui/aura/window.h" 32 #include "ui/aura/window.h"
33 #include "ui/aura/window_event_dispatcher.h"
34 #include "ui/aura/window_property.h" 34 #include "ui/aura/window_property.h"
35 #include "ui/aura/window_tracker.h" 35 #include "ui/aura/window_tracker.h"
36 #include "ui/compositor/compositor.h" 36 #include "ui/compositor/compositor.h"
37 #include "ui/compositor/compositor_vsync_manager.h" 37 #include "ui/compositor/compositor_vsync_manager.h"
38 #include "ui/gfx/display.h" 38 #include "ui/gfx/display.h"
39 #include "ui/gfx/screen.h" 39 #include "ui/gfx/screen.h"
40 40
41 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
42 #include "base/sys_info.h" 42 #include "base/sys_info.h"
43 #include "base/time/time.h" 43 #include "base/time/time.h"
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 std::string name = 755 std::string name =
756 root_windows[i] == primary ? "aura_root_0" : "aura_root_x"; 756 root_windows[i] == primary ? "aura_root_0" : "aura_root_x";
757 gfx::AcceleratedWidget xwindow = 757 gfx::AcceleratedWidget xwindow =
758 root_windows[i]->GetDispatcher()->host()->GetAcceleratedWidget(); 758 root_windows[i]->GetDispatcher()->host()->GetAcceleratedWidget();
759 XStoreName(gfx::GetXDisplay(), xwindow, name.c_str()); 759 XStoreName(gfx::GetXDisplay(), xwindow, name.c_str());
760 } 760 }
761 #endif 761 #endif
762 } 762 }
763 763
764 } // namespace ash 764 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/cursor_window_controller.cc ('k') | ash/display/display_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698