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

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

Issue 9463003: aura-x11: Add custom web cursor support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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
« no previous file with comments | « ui/aura/root_window.h ('k') | ui/aura/root_window_host.h » ('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/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/root_window_host.h"
19 #include "ui/aura/root_window_observer.h"
20 #include "ui/aura/event.h" 18 #include "ui/aura/event.h"
21 #include "ui/aura/event_filter.h" 19 #include "ui/aura/event_filter.h"
22 #include "ui/aura/focus_manager.h" 20 #include "ui/aura/focus_manager.h"
23 #include "ui/aura/gestures/gesture_recognizer.h" 21 #include "ui/aura/gestures/gesture_recognizer.h"
24 #include "ui/aura/monitor.h" 22 #include "ui/aura/monitor.h"
25 #include "ui/aura/monitor_manager.h" 23 #include "ui/aura/monitor_manager.h"
24 #include "ui/aura/root_window_host.h"
25 #include "ui/aura/root_window_observer.h"
26 #include "ui/aura/window.h" 26 #include "ui/aura/window.h"
27 #include "ui/aura/window_delegate.h" 27 #include "ui/aura/window_delegate.h"
28 #include "ui/base/hit_test.h" 28 #include "ui/base/hit_test.h"
29 #include "ui/gfx/compositor/compositor.h" 29 #include "ui/gfx/compositor/compositor.h"
30 #include "ui/gfx/compositor/layer.h" 30 #include "ui/gfx/compositor/layer.h"
31 #include "ui/gfx/compositor/layer_animator.h" 31 #include "ui/gfx/compositor/layer_animator.h"
32 32
33 using std::vector; 33 using std::vector;
34 34
35 namespace aura { 35 namespace aura {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 //////////////////////////////////////////////////////////////////////////////// 83 ////////////////////////////////////////////////////////////////////////////////
84 // RootWindow, public: 84 // RootWindow, public:
85 85
86 RootWindow::RootWindow(const gfx::Rect& initial_bounds) 86 RootWindow::RootWindow(const gfx::Rect& initial_bounds)
87 : Window(NULL), 87 : Window(NULL),
88 host_(aura::RootWindowHost::Create(initial_bounds)), 88 host_(aura::RootWindowHost::Create(initial_bounds)),
89 ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)), 89 ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)),
90 ALLOW_THIS_IN_INITIALIZER_LIST(event_factory_(this)), 90 ALLOW_THIS_IN_INITIALIZER_LIST(event_factory_(this)),
91 mouse_button_flags_(0), 91 mouse_button_flags_(0),
92 last_cursor_(kCursorNull), 92 last_cursor_(ui::kCursorNull),
93 cursor_shown_(true), 93 cursor_shown_(true),
94 capture_window_(NULL), 94 capture_window_(NULL),
95 mouse_pressed_handler_(NULL), 95 mouse_pressed_handler_(NULL),
96 mouse_moved_handler_(NULL), 96 mouse_moved_handler_(NULL),
97 focused_window_(NULL), 97 focused_window_(NULL),
98 ALLOW_THIS_IN_INITIALIZER_LIST( 98 ALLOW_THIS_IN_INITIALIZER_LIST(
99 gesture_recognizer_(GestureRecognizer::Create())), 99 gesture_recognizer_(GestureRecognizer::Create())),
100 synthesize_mouse_move_(false), 100 synthesize_mouse_move_(false),
101 waiting_on_compositing_end_(false), 101 waiting_on_compositing_end_(false),
102 draw_on_compositing_end_(false), 102 draw_on_compositing_end_(false),
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 void RootWindow::UnlockCompositor() { 878 void RootWindow::UnlockCompositor() {
879 DCHECK(compositor_lock_); 879 DCHECK(compositor_lock_);
880 compositor_lock_ = NULL; 880 compositor_lock_ = NULL;
881 if (draw_on_compositor_unlock_) { 881 if (draw_on_compositor_unlock_) {
882 draw_on_compositor_unlock_ = false; 882 draw_on_compositor_unlock_ = false;
883 ScheduleDraw(); 883 ScheduleDraw();
884 } 884 }
885 } 885 }
886 886
887 } // namespace aura 887 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/root_window.h ('k') | ui/aura/root_window_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698