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

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

Issue 9960042: Refactor screen/monitor so that gfx::Screen returns monitor object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix command line Created 8 years, 8 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
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/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/debug/trace_event.h" 11 #include "base/debug/trace_event.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "ui/aura/aura_switches.h" 14 #include "ui/aura/aura_switches.h"
15 #include "ui/aura/client/activation_client.h" 15 #include "ui/aura/client/activation_client.h"
16 #include "ui/aura/client/event_client.h" 16 #include "ui/aura/client/event_client.h"
17 #include "ui/aura/env.h" 17 #include "ui/aura/env.h"
18 #include "ui/aura/event.h" 18 #include "ui/aura/event.h"
19 #include "ui/aura/event_filter.h" 19 #include "ui/aura/event_filter.h"
20 #include "ui/aura/focus_manager.h" 20 #include "ui/aura/focus_manager.h"
21 #include "ui/aura/monitor.h"
22 #include "ui/aura/monitor_manager.h"
23 #include "ui/aura/root_window_host.h" 21 #include "ui/aura/root_window_host.h"
24 #include "ui/aura/root_window_observer.h" 22 #include "ui/aura/root_window_observer.h"
25 #include "ui/aura/window.h" 23 #include "ui/aura/window.h"
26 #include "ui/aura/window_delegate.h" 24 #include "ui/aura/window_delegate.h"
27 #include "ui/base/gestures/gesture_recognizer.h" 25 #include "ui/base/gestures/gesture_recognizer.h"
28 #include "ui/base/gestures/gesture_types.h" 26 #include "ui/base/gestures/gesture_types.h"
29 #include "ui/base/hit_test.h" 27 #include "ui/base/hit_test.h"
30 #include "ui/gfx/compositor/compositor.h" 28 #include "ui/gfx/compositor/compositor.h"
31 #include "ui/gfx/compositor/layer.h" 29 #include "ui/gfx/compositor/layer.h"
32 #include "ui/gfx/compositor/layer_animator.h" 30 #include "ui/gfx/compositor/layer_animator.h"
(...skipping 884 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 void RootWindow::UnlockCompositor() { 915 void RootWindow::UnlockCompositor() {
918 DCHECK(compositor_lock_); 916 DCHECK(compositor_lock_);
919 compositor_lock_ = NULL; 917 compositor_lock_ = NULL;
920 if (draw_on_compositor_unlock_) { 918 if (draw_on_compositor_unlock_) {
921 draw_on_compositor_unlock_ = false; 919 draw_on_compositor_unlock_ = false;
922 ScheduleDraw(); 920 ScheduleDraw();
923 } 921 }
924 } 922 }
925 923
926 } // namespace aura 924 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698