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

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

Issue 2766543002: Move even more from WmShell to Shell (Closed)
Patch Set: Created 3 years, 9 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/common/accelerators/accelerator_controller.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/common/accelerators/accelerator_commands.h" 5 #include "ash/common/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_shell.h" 10 #include "ash/common/wm_shell.h"
11 #include "ash/common/wm_window.h" 11 #include "ash/common/wm_window.h"
12 #include "ash/shell.h"
12 #include "base/metrics/user_metrics.h" 13 #include "base/metrics/user_metrics.h"
13 14
14 namespace ash { 15 namespace ash {
15 namespace accelerators { 16 namespace accelerators {
16 17
17 bool ToggleMinimized() { 18 bool ToggleMinimized() {
18 WmWindow* window = WmShell::Get()->GetActiveWindow(); 19 WmWindow* window = WmShell::Get()->GetActiveWindow();
19 // Attempt to restore the window that would be cycled through next from 20 // Attempt to restore the window that would be cycled through next from
20 // the launcher when there is no active window. 21 // the launcher when there is no active window.
21 if (!window) { 22 if (!window) {
22 MruWindowTracker::WindowList mru_windows( 23 MruWindowTracker::WindowList mru_windows(
23 WmShell::Get()->mru_window_tracker()->BuildMruWindowList()); 24 Shell::Get()->mru_window_tracker()->BuildMruWindowList());
24 if (!mru_windows.empty()) 25 if (!mru_windows.empty())
25 mru_windows.front()->GetWindowState()->Activate(); 26 mru_windows.front()->GetWindowState()->Activate();
26 return true; 27 return true;
27 } 28 }
28 wm::WindowState* window_state = window->GetWindowState(); 29 wm::WindowState* window_state = window->GetWindowState();
29 if (!window_state->CanMinimize()) 30 if (!window_state->CanMinimize())
30 return false; 31 return false;
31 window_state->Minimize(); 32 window_state->Minimize();
32 return true; 33 return true;
33 } 34 }
(...skipping 10 matching lines...) Expand all
44 void ToggleFullscreen() { 45 void ToggleFullscreen() {
45 WmWindow* active_window = WmShell::Get()->GetActiveWindow(); 46 WmWindow* active_window = WmShell::Get()->GetActiveWindow();
46 if (!active_window) 47 if (!active_window)
47 return; 48 return;
48 const wm::WMEvent event(wm::WM_EVENT_TOGGLE_FULLSCREEN); 49 const wm::WMEvent event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
49 active_window->GetWindowState()->OnWMEvent(&event); 50 active_window->GetWindowState()->OnWMEvent(&event);
50 } 51 }
51 52
52 } // namespace accelerators 53 } // namespace accelerators
53 } // namespace ash 54 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698