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

Side by Side Diff: ash/common/wm/maximize_mode/maximize_mode_window_manager.cc

Issue 2775973002: Promotes more accessors from WmShell to Shell (Closed)
Patch Set: feedback 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 | « ash/common/wallpaper/wallpaper_view.cc ('k') | ash/common/wm/panels/panel_layout_manager.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/wm/maximize_mode/maximize_mode_window_manager.h" 5 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
6 6
7 #include "ash/common/ash_switches.h" 7 #include "ash/common/ash_switches.h"
8 #include "ash/common/session/session_state_delegate.h" 8 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" 9 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
10 #include "ash/common/wm/maximize_mode/maximize_mode_window_state.h" 10 #include "ash/common/wm/maximize_mode/maximize_mode_window_state.h"
(...skipping 15 matching lines...) Expand all
26 #include "ui/aura/client/aura_constants.h" 26 #include "ui/aura/client/aura_constants.h"
27 #include "ui/display/screen.h" 27 #include "ui/display/screen.h"
28 28
29 namespace ash { 29 namespace ash {
30 30
31 namespace { 31 namespace {
32 32
33 // Exits overview mode if it is currently active. 33 // Exits overview mode if it is currently active.
34 void CancelOverview() { 34 void CancelOverview() {
35 WindowSelectorController* controller = 35 WindowSelectorController* controller =
36 WmShell::Get()->window_selector_controller(); 36 Shell::Get()->window_selector_controller();
37 if (controller->IsSelecting()) 37 if (controller->IsSelecting())
38 controller->OnSelectionEnded(); 38 controller->OnSelectionEnded();
39 } 39 }
40 40
41 } // namespace 41 } // namespace
42 42
43 MaximizeModeWindowManager::~MaximizeModeWindowManager() { 43 MaximizeModeWindowManager::~MaximizeModeWindowManager() {
44 // Overview mode needs to be ended before exiting maximize mode to prevent 44 // Overview mode needs to be ended before exiting maximize mode to prevent
45 // transforming windows which are currently in 45 // transforming windows which are currently in
46 // overview: http://crbug.com/366605 46 // overview: http://crbug.com/366605
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 RootWindowController* controller = root->GetRootWindowController(); 319 RootWindowController* controller = root->GetRootWindowController();
320 WmWindow* default_container = 320 WmWindow* default_container =
321 root->GetChildByShellWindowId(kShellWindowId_DefaultContainer); 321 root->GetChildByShellWindowId(kShellWindowId_DefaultContainer);
322 controller->workspace_controller()->SetMaximizeBackdropDelegate( 322 controller->workspace_controller()->SetMaximizeBackdropDelegate(
323 enable ? base::MakeUnique<WorkspaceBackdropDelegate>(default_container) 323 enable ? base::MakeUnique<WorkspaceBackdropDelegate>(default_container)
324 : nullptr); 324 : nullptr);
325 } 325 }
326 } 326 }
327 327
328 } // namespace ash 328 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wallpaper/wallpaper_view.cc ('k') | ash/common/wm/panels/panel_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698