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

Side by Side Diff: ash/root_window_controller.cc

Issue 1921883002: Removes WindowState::aura_window() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix windows build 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 | « ash/frame/custom_frame_view_ash.cc ('k') | ash/shell.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <queue> 7 #include <queue>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_constants.h" 10 #include "ash/ash_constants.h"
(...skipping 794 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 805
806 aura::Window* lock_background_container = 806 aura::Window* lock_background_container =
807 GetContainer(kShellWindowId_LockScreenBackgroundContainer); 807 GetContainer(kShellWindowId_LockScreenBackgroundContainer);
808 lock_background_container->AddChild(mouse_event_target_.get()); 808 lock_background_container->AddChild(mouse_event_target_.get());
809 mouse_event_target_->Show(); 809 mouse_event_target_->Show();
810 } 810 }
811 811
812 // Create Docked windows layout manager 812 // Create Docked windows layout manager
813 wm::WmWindow* docked_container = 813 wm::WmWindow* docked_container =
814 wm::WmWindowAura::Get(GetContainer(kShellWindowId_DockedContainer)); 814 wm::WmWindowAura::Get(GetContainer(kShellWindowId_DockedContainer));
815 docked_layout_manager_ = 815 docked_layout_manager_ = new DockedWindowLayoutManager(docked_container);
816 new DockedWindowLayoutManager(docked_container, workspace_controller());
817 docked_container->SetLayoutManager(base::WrapUnique(docked_layout_manager_)); 816 docked_container->SetLayoutManager(base::WrapUnique(docked_layout_manager_));
818 817
819 // Installs SnapLayoutManager to containers who set the 818 // Installs SnapLayoutManager to containers who set the
820 // |kSnapsChildrenToPhysicalPixelBoundary| property. 819 // |kSnapsChildrenToPhysicalPixelBoundary| property.
821 wm::InstallSnapLayoutManagerToContainers(root_window); 820 wm::InstallSnapLayoutManagerToContainers(root_window);
822 821
823 // Create Panel layout manager 822 // Create Panel layout manager
824 aura::Window* panel_container = GetContainer(kShellWindowId_PanelContainer); 823 aura::Window* panel_container = GetContainer(kShellWindowId_PanelContainer);
825 wm::WmWindow* wm_panel_container = wm::WmWindowAura::Get(panel_container); 824 wm::WmWindow* wm_panel_container = wm::WmWindowAura::Get(panel_container);
826 panel_layout_manager_ = new PanelLayoutManager(wm_panel_container); 825 panel_layout_manager_ = new PanelLayoutManager(wm_panel_container);
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
1087 else 1086 else
1088 DisableTouchHudProjection(); 1087 DisableTouchHudProjection();
1089 } 1088 }
1090 1089
1091 RootWindowController* GetRootWindowController( 1090 RootWindowController* GetRootWindowController(
1092 const aura::Window* root_window) { 1091 const aura::Window* root_window) {
1093 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; 1092 return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
1094 } 1093 }
1095 1094
1096 } // namespace ash 1095 } // namespace ash
OLDNEW
« no previous file with comments | « ash/frame/custom_frame_view_ash.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698