| 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 "ash/touch/touch_observer_hud.h" | 5 #include "ash/touch/touch_observer_hud.h" |
| 6 | 6 |
| 7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/root_window_settings.h" | 8 #include "ash/root_window_settings.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
| 11 #include "ash/wm/property_util.h" | |
| 12 #include "ui/aura/root_window.h" | 11 #include "ui/aura/root_window.h" |
| 13 #include "ui/gfx/display.h" | 12 #include "ui/gfx/display.h" |
| 14 #include "ui/gfx/rect.h" | 13 #include "ui/gfx/rect.h" |
| 15 #include "ui/gfx/screen.h" | 14 #include "ui/gfx/screen.h" |
| 16 #include "ui/gfx/size.h" | 15 #include "ui/gfx/size.h" |
| 17 #include "ui/views/widget/widget.h" | 16 #include "ui/views/widget/widget.h" |
| 18 | 17 |
| 19 namespace ash { | 18 namespace ash { |
| 20 namespace internal { | 19 namespace internal { |
| 21 | 20 |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 internal::kShellWindowId_OverlayContainer)); | 141 internal::kShellWindowId_OverlayContainer)); |
| 143 | 142 |
| 144 RootWindowController* controller = GetRootWindowController(root_window_); | 143 RootWindowController* controller = GetRootWindowController(root_window_); |
| 145 SetHudForRootWindowController(controller); | 144 SetHudForRootWindowController(controller); |
| 146 | 145 |
| 147 root_window_->AddPreTargetHandler(this); | 146 root_window_->AddPreTargetHandler(this); |
| 148 } | 147 } |
| 149 | 148 |
| 150 } // namespace internal | 149 } // namespace internal |
| 151 } // namespace ash | 150 } // namespace ash |
| OLD | NEW |