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

Side by Side Diff: ash/mus/root_window_controller.cc

Issue 2150023002: Add ShellDelegate, MediaDelegate and KeyboardUI stubs to mus ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ShellDelegate via unique_ptr Created 4 years, 5 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/mus/root_window_controller.h" 5 #include "ash/mus/root_window_controller.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm>
9 #include <map> 10 #include <map>
10 #include <sstream> 11 #include <sstream>
11 12
12 #include "ash/common/root_window_controller_common.h" 13 #include "ash/common/root_window_controller_common.h"
13 #include "ash/common/shell_window_ids.h" 14 #include "ash/common/shell_window_ids.h"
14 #include "ash/common/wm/always_on_top_controller.h" 15 #include "ash/common/wm/always_on_top_controller.h"
15 #include "ash/common/wm/container_finder.h" 16 #include "ash/common/wm/container_finder.h"
16 #include "ash/common/wm/dock/docked_window_layout_manager.h" 17 #include "ash/common/wm/dock/docked_window_layout_manager.h"
17 #include "ash/common/wm/panels/panel_layout_manager.h" 18 #include "ash/common/wm/panels/panel_layout_manager.h"
18 #include "ash/common/wm/root_window_layout_manager.h" 19 #include "ash/common/wm/root_window_layout_manager.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 base::WrapUnique(new DockedWindowLayoutManager(docked_container))); 255 base::WrapUnique(new DockedWindowLayoutManager(docked_container)));
255 256
256 WmWindowMus* panel_container = 257 WmWindowMus* panel_container =
257 GetWindowByShellWindowId(kShellWindowId_PanelContainer); 258 GetWindowByShellWindowId(kShellWindowId_PanelContainer);
258 panel_container->SetLayoutManager( 259 panel_container->SetLayoutManager(
259 base::WrapUnique(new PanelLayoutManager(panel_container))); 260 base::WrapUnique(new PanelLayoutManager(panel_container)));
260 } 261 }
261 262
262 } // namespace mus 263 } // namespace mus
263 } // namespace ash 264 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698