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

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

Issue 2297893002: Merges RootWindowControllerCommon into WmRootWindowController (Closed)
Patch Set: includes Created 4 years, 3 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
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/shell_window_ids.h" 9 #include "ash/common/shell_window_ids.h"
10 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" 10 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
11 #include "ash/common/wm/maximize_mode/maximize_mode_window_state.h" 11 #include "ash/common/wm/maximize_mode/maximize_mode_window_state.h"
12 #include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h" 12 #include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h"
13 #include "ash/common/wm/mru_window_tracker.h" 13 #include "ash/common/wm/mru_window_tracker.h"
14 #include "ash/common/wm/overview/window_selector_controller.h" 14 #include "ash/common/wm/overview/window_selector_controller.h"
15 #include "ash/common/wm/window_state.h" 15 #include "ash/common/wm/window_state.h"
16 #include "ash/common/wm/wm_event.h" 16 #include "ash/common/wm/wm_event.h"
17 #include "ash/common/wm/workspace_controller.h"
17 #include "ash/common/wm_root_window_controller.h" 18 #include "ash/common/wm_root_window_controller.h"
18 #include "ash/common/wm_shell.h" 19 #include "ash/common/wm_shell.h"
19 #include "ash/common/wm_window.h" 20 #include "ash/common/wm_window.h"
20 #include "ash/common/wm_window_property.h" 21 #include "ash/common/wm_window_property.h"
21 #include "base/command_line.h" 22 #include "base/command_line.h"
22 #include "base/memory/ptr_util.h" 23 #include "base/memory/ptr_util.h"
23 #include "base/stl_util.h" 24 #include "base/stl_util.h"
24 #include "ui/display/screen.h" 25 #include "ui/display/screen.h"
25 26
26 namespace ash { 27 namespace ash {
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 313
313 if (backdrops_hidden_) 314 if (backdrops_hidden_)
314 return; 315 return;
315 316
316 // Inform the WorkspaceLayoutManager that we want to show a backdrop behind 317 // Inform the WorkspaceLayoutManager that we want to show a backdrop behind
317 // the topmost window of its container. 318 // the topmost window of its container.
318 for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) { 319 for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) {
319 WmRootWindowController* controller = root->GetRootWindowController(); 320 WmRootWindowController* controller = root->GetRootWindowController();
320 WmWindow* default_container = 321 WmWindow* default_container =
321 root->GetChildByShellWindowId(kShellWindowId_DefaultContainer); 322 root->GetChildByShellWindowId(kShellWindowId_DefaultContainer);
322 controller->SetMaximizeBackdropDelegate(base::WrapUnique( 323 controller->workspace_controller()->SetMaximizeBackdropDelegate(
323 enable ? new WorkspaceBackdropDelegate(default_container) : nullptr)); 324 base::WrapUnique(enable
msw 2016/08/30 21:26:46 nit: enable ? base::MakeUnique<WorkspaceBackdropDe
sky 2016/08/30 22:02:56 Done.
325 ? new WorkspaceBackdropDelegate(default_container)
326 : nullptr));
324 } 327 }
325 } 328 }
326 329
327 } // namespace ash 330 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698