| OLD | NEW |
| 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/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
| 13 #include "ui/aura/aura_switches.h" | 13 #include "ui/aura/aura_switches.h" |
| 14 #include "ui/aura/client/activation_client.h" | 14 #include "ui/aura/client/activation_client.h" |
| 15 #include "ui/aura/client/event_client.h" | 15 #include "ui/aura/client/event_client.h" |
| 16 #include "ui/aura/env.h" | 16 #include "ui/aura/env.h" |
| 17 #include "ui/aura/root_window_host.h" | |
| 18 #include "ui/aura/root_window_observer.h" | |
| 19 #include "ui/aura/event.h" | 17 #include "ui/aura/event.h" |
| 20 #include "ui/aura/event_filter.h" | 18 #include "ui/aura/event_filter.h" |
| 21 #include "ui/aura/focus_manager.h" | 19 #include "ui/aura/focus_manager.h" |
| 22 #include "ui/aura/gestures/gesture_recognizer.h" | 20 #include "ui/aura/gestures/gesture_recognizer.h" |
| 23 #include "ui/aura/monitor.h" | 21 #include "ui/aura/monitor.h" |
| 24 #include "ui/aura/monitor_manager.h" | 22 #include "ui/aura/monitor_manager.h" |
| 23 #include "ui/aura/root_window_host.h" |
| 24 #include "ui/aura/root_window_observer.h" |
| 25 #include "ui/aura/window.h" | 25 #include "ui/aura/window.h" |
| 26 #include "ui/aura/window_delegate.h" | 26 #include "ui/aura/window_delegate.h" |
| 27 #include "ui/base/hit_test.h" | 27 #include "ui/base/hit_test.h" |
| 28 #include "ui/gfx/compositor/compositor.h" | 28 #include "ui/gfx/compositor/compositor.h" |
| 29 #include "ui/gfx/compositor/layer.h" | 29 #include "ui/gfx/compositor/layer.h" |
| 30 #include "ui/gfx/compositor/layer_animator.h" | 30 #include "ui/gfx/compositor/layer_animator.h" |
| 31 | 31 |
| 32 using std::vector; | 32 using std::vector; |
| 33 | 33 |
| 34 namespace aura { | 34 namespace aura { |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 | 81 |
| 82 //////////////////////////////////////////////////////////////////////////////// | 82 //////////////////////////////////////////////////////////////////////////////// |
| 83 // RootWindow, public: | 83 // RootWindow, public: |
| 84 | 84 |
| 85 RootWindow::RootWindow(const gfx::Rect& initial_bounds) | 85 RootWindow::RootWindow(const gfx::Rect& initial_bounds) |
| 86 : Window(NULL), | 86 : Window(NULL), |
| 87 host_(aura::RootWindowHost::Create(initial_bounds)), | 87 host_(aura::RootWindowHost::Create(initial_bounds)), |
| 88 ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)), | 88 ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)), |
| 89 ALLOW_THIS_IN_INITIALIZER_LIST(event_factory_(this)), | 89 ALLOW_THIS_IN_INITIALIZER_LIST(event_factory_(this)), |
| 90 mouse_button_flags_(0), | 90 mouse_button_flags_(0), |
| 91 last_cursor_(kCursorNull), | 91 last_cursor_(ui::kCursorNull), |
| 92 cursor_shown_(true), | 92 cursor_shown_(true), |
| 93 capture_window_(NULL), | 93 capture_window_(NULL), |
| 94 mouse_pressed_handler_(NULL), | 94 mouse_pressed_handler_(NULL), |
| 95 mouse_moved_handler_(NULL), | 95 mouse_moved_handler_(NULL), |
| 96 focused_window_(NULL), | 96 focused_window_(NULL), |
| 97 ALLOW_THIS_IN_INITIALIZER_LIST( | 97 ALLOW_THIS_IN_INITIALIZER_LIST( |
| 98 gesture_recognizer_(GestureRecognizer::Create())), | 98 gesture_recognizer_(GestureRecognizer::Create())), |
| 99 synthesize_mouse_move_(false), | 99 synthesize_mouse_move_(false), |
| 100 waiting_on_compositing_end_(false), | 100 waiting_on_compositing_end_(false), |
| 101 draw_on_compositing_end_(false), | 101 draw_on_compositing_end_(false), |
| (...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 868 void RootWindow::UnlockCompositor() { | 868 void RootWindow::UnlockCompositor() { |
| 869 DCHECK(compositor_lock_); | 869 DCHECK(compositor_lock_); |
| 870 compositor_lock_ = NULL; | 870 compositor_lock_ = NULL; |
| 871 if (draw_on_compositor_unlock_) { | 871 if (draw_on_compositor_unlock_) { |
| 872 draw_on_compositor_unlock_ = false; | 872 draw_on_compositor_unlock_ = false; |
| 873 ScheduleDraw(); | 873 ScheduleDraw(); |
| 874 } | 874 } |
| 875 } | 875 } |
| 876 | 876 |
| 877 } // namespace aura | 877 } // namespace aura |
| OLD | NEW |