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

Side by Side Diff: ash/accelerators/accelerator_commands.cc

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 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
« no previous file with comments | « no previous file | ash/accelerators/accelerator_commands_unittest.cc » ('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 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/display/display_manager.h" 7 #include "ash/display/display_manager.h"
8 #include "ash/display/display_util.h" 8 #include "ash/display/display_util.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
11 #include "ash/wm/common/wm_event.h" 11 #include "ash/wm/common/wm_event.h"
12 #include "ash/wm/mru_window_tracker.h" 12 #include "ash/wm/mru_window_tracker.h"
13 #include "ash/wm/window_state.h" 13 #include "ash/wm/window_state.h"
14 #include "ash/wm/window_state_aura.h"
14 #include "ash/wm/window_util.h" 15 #include "ash/wm/window_util.h"
15 #include "base/metrics/user_metrics.h" 16 #include "base/metrics/user_metrics.h"
16 17
17 namespace ash { 18 namespace ash {
18 namespace accelerators { 19 namespace accelerators {
19 20
20 bool ToggleMinimized() { 21 bool ToggleMinimized() {
21 aura::Window* window = wm::GetActiveWindow(); 22 aura::Window* window = wm::GetActiveWindow();
22 // Attempt to restore the window that would be cycled through next from 23 // Attempt to restore the window that would be cycled through next from
23 // the launcher when there is no active window. 24 // the launcher when there is no active window.
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 std::find_if(modes.begin(), modes.end(), 101 std::find_if(modes.begin(), modes.end(),
101 [](const DisplayMode& mode) { return mode.native; }); 102 [](const DisplayMode& mode) { return mode.native; });
102 display_manager->SetDisplayMode(DisplayManager::kUnifiedDisplayId, *iter); 103 display_manager->SetDisplayMode(DisplayManager::kUnifiedDisplayId, *iter);
103 } else { 104 } else {
104 SetDisplayUIScale(display_manager->GetDisplayIdForUIScaling(), 1.0f); 105 SetDisplayUIScale(display_manager->GetDisplayIdForUIScaling(), 1.0f);
105 } 106 }
106 } 107 }
107 108
108 } // namespace accelerators 109 } // namespace accelerators
109 } // namespace ash 110 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/accelerators/accelerator_commands_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698