Chromium Code Reviews| 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.h" | 5 #include "ash/accelerators/accelerator_commands.h" |
| 6 | 6 |
| 7 #include "ash/common/wm/mru_window_tracker.h" | 7 #include "ash/common/wm/mru_window_tracker.h" |
| 8 #include "ash/common/wm/window_state.h" | 8 #include "ash/common/wm/window_state.h" |
| 9 #include "ash/common/wm/wm_event.h" | 9 #include "ash/common/wm/wm_event.h" |
| 10 #include "ash/common/wm_window.h" | 10 #include "ash/common/wm_window.h" |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 100 const std::vector<DisplayMode>& modes = display_info.display_modes(); | 100 const std::vector<DisplayMode>& modes = display_info.display_modes(); |
| 101 auto iter = | 101 auto iter = |
| 102 std::find_if(modes.begin(), modes.end(), | 102 std::find_if(modes.begin(), modes.end(), |
| 103 [](const DisplayMode& mode) { return mode.native; }); | 103 [](const DisplayMode& mode) { return mode.native; }); |
| 104 display_manager->SetDisplayMode(DisplayManager::kUnifiedDisplayId, *iter); | 104 display_manager->SetDisplayMode(DisplayManager::kUnifiedDisplayId, *iter); |
| 105 } else { | 105 } else { |
| 106 SetDisplayUIScale(display_manager->GetDisplayIdForUIScaling(), 1.0f); | 106 SetDisplayUIScale(display_manager->GetDisplayIdForUIScaling(), 1.0f); |
| 107 } | 107 } |
| 108 } | 108 } |
| 109 | 109 |
| 110 void Unpin() { | |
| 111 wm::WindowState* window_state = wm::GetActiveWindowState(); | |
|
oshima
2016/06/18 04:18:13
Didn't we have a way to get pinned window?
hidehiko
2016/06/18 05:38:16
No from here.
We can add, but for consistency with
| |
| 112 if (window_state->IsPinned()) | |
| 113 window_state->Restore(); | |
| 114 } | |
| 115 | |
| 110 } // namespace accelerators | 116 } // namespace accelerators |
| 111 } // namespace ash | 117 } // namespace ash |
| OLD | NEW |