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

Side by Side Diff: ui/aura/root_window.cc

Issue 10917075: events: Move some files into ui/base/events/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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 | « ui/aura/root_window.h ('k') | ui/aura/root_window_host_linux.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 "ui/aura/root_window.h" 5 #include "ui/aura/root_window.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/debug/trace_event.h" 12 #include "base/debug/trace_event.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/message_loop.h" 14 #include "base/message_loop.h"
15 #include "ui/aura/aura_switches.h" 15 #include "ui/aura/aura_switches.h"
16 #include "ui/aura/client/activation_client.h" 16 #include "ui/aura/client/activation_client.h"
17 #include "ui/aura/client/capture_client.h" 17 #include "ui/aura/client/capture_client.h"
18 #include "ui/aura/client/drag_drop_client.h" 18 #include "ui/aura/client/drag_drop_client.h"
19 #include "ui/aura/client/event_client.h" 19 #include "ui/aura/client/event_client.h"
20 #include "ui/aura/client/screen_position_client.h" 20 #include "ui/aura/client/screen_position_client.h"
21 #include "ui/aura/display_manager.h"
21 #include "ui/aura/env.h" 22 #include "ui/aura/env.h"
22 #include "ui/aura/event_filter.h" 23 #include "ui/aura/event_filter.h"
23 #include "ui/aura/focus_manager.h" 24 #include "ui/aura/focus_manager.h"
24 #include "ui/aura/display_manager.h"
25 #include "ui/aura/root_window_host.h" 25 #include "ui/aura/root_window_host.h"
26 #include "ui/aura/root_window_observer.h" 26 #include "ui/aura/root_window_observer.h"
27 #include "ui/aura/window.h" 27 #include "ui/aura/window.h"
28 #include "ui/aura/window_delegate.h" 28 #include "ui/aura/window_delegate.h"
29 #include "ui/aura/window_tracker.h" 29 #include "ui/aura/window_tracker.h"
30 #include "ui/base/event.h" 30 #include "ui/base/events/event.h"
31 #include "ui/base/gestures/gesture_recognizer.h" 31 #include "ui/base/gestures/gesture_recognizer.h"
32 #include "ui/base/gestures/gesture_types.h" 32 #include "ui/base/gestures/gesture_types.h"
33 #include "ui/base/hit_test.h" 33 #include "ui/base/hit_test.h"
34 #include "ui/compositor/compositor.h" 34 #include "ui/compositor/compositor.h"
35 #include "ui/compositor/dip_util.h" 35 #include "ui/compositor/dip_util.h"
36 #include "ui/compositor/layer.h" 36 #include "ui/compositor/layer.h"
37 #include "ui/compositor/layer_animator.h" 37 #include "ui/compositor/layer_animator.h"
38 #include "ui/gfx/display.h" 38 #include "ui/gfx/display.h"
39 #include "ui/gfx/point3.h" 39 #include "ui/gfx/point3.h"
40 #include "ui/gfx/screen.h" 40 #include "ui/gfx/screen.h"
(...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after
1064 void RootWindow::UnlockCompositor() { 1064 void RootWindow::UnlockCompositor() {
1065 DCHECK(compositor_lock_); 1065 DCHECK(compositor_lock_);
1066 compositor_lock_ = NULL; 1066 compositor_lock_ = NULL;
1067 if (draw_on_compositor_unlock_) { 1067 if (draw_on_compositor_unlock_) {
1068 draw_on_compositor_unlock_ = false; 1068 draw_on_compositor_unlock_ = false;
1069 ScheduleDraw(); 1069 ScheduleDraw();
1070 } 1070 }
1071 } 1071 }
1072 1072
1073 } // namespace aura 1073 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/root_window.h ('k') | ui/aura/root_window_host_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698