| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/accelerators/accelerator_commands_aura.h" | 5 #include "ash/accelerators/accelerator_commands_aura.h" |
| 6 | 6 |
| 7 #include "ash/common/wm/window_state.h" | |
| 8 #include "ash/common/wm_window.h" | |
| 9 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 10 #include "ash/wm/screen_pinning_controller.h" | 8 #include "ash/wm/screen_pinning_controller.h" |
| 9 #include "ash/wm/window_state.h" |
| 10 #include "ash/wm_window.h" |
| 11 #include "base/metrics/user_metrics.h" | 11 #include "base/metrics/user_metrics.h" |
| 12 #include "ui/display/manager/display_manager.h" | 12 #include "ui/display/manager/display_manager.h" |
| 13 #include "ui/display/manager/managed_display_info.h" | 13 #include "ui/display/manager/managed_display_info.h" |
| 14 | 14 |
| 15 namespace ash { | 15 namespace ash { |
| 16 namespace accelerators { | 16 namespace accelerators { |
| 17 | 17 |
| 18 void ToggleTouchHudProjection() { | 18 void ToggleTouchHudProjection() { |
| 19 base::RecordAction(base::UserMetricsAction("Accel_Touch_Hud_Clear")); | 19 base::RecordAction(base::UserMetricsAction("Accel_Touch_Hud_Clear")); |
| 20 bool enabled = Shell::GetInstance()->is_touch_hud_projection_enabled(); | 20 bool enabled = Shell::GetInstance()->is_touch_hud_projection_enabled(); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 48 | 48 |
| 49 void Unpin() { | 49 void Unpin() { |
| 50 WmWindow* pinned_window = | 50 WmWindow* pinned_window = |
| 51 Shell::GetInstance()->screen_pinning_controller()->pinned_window(); | 51 Shell::GetInstance()->screen_pinning_controller()->pinned_window(); |
| 52 if (pinned_window) | 52 if (pinned_window) |
| 53 pinned_window->GetWindowState()->Restore(); | 53 pinned_window->GetWindowState()->Restore(); |
| 54 } | 54 } |
| 55 | 55 |
| 56 } // namespace accelerators | 56 } // namespace accelerators |
| 57 } // namespace ash | 57 } // namespace ash |
| OLD | NEW |