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

Side by Side Diff: ash/sysui/sysui_application.cc

Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use_root_window_controller_common
Patch Set: merge Created 4 years, 6 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/system/web_notification/web_notification_tray.cc ('k') | ash/test/test_shell_delegate.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 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/sysui/sysui_application.h" 5 #include "ash/sysui/sysui_application.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/common/shell_window_ids.h"
12 #include "ash/desktop_background/desktop_background_controller.h" 13 #include "ash/desktop_background/desktop_background_controller.h"
13 #include "ash/host/ash_window_tree_host_init_params.h" 14 #include "ash/host/ash_window_tree_host_init_params.h"
14 #include "ash/host/ash_window_tree_host_platform.h" 15 #include "ash/host/ash_window_tree_host_platform.h"
15 #include "ash/material_design/material_design_controller.h" 16 #include "ash/material_design/material_design_controller.h"
16 #include "ash/public/interfaces/ash_window_type.mojom.h" 17 #include "ash/public/interfaces/ash_window_type.mojom.h"
17 #include "ash/public/interfaces/container.mojom.h" 18 #include "ash/public/interfaces/container.mojom.h"
18 #include "ash/root_window_settings.h" 19 #include "ash/root_window_settings.h"
19 #include "ash/shell.h" 20 #include "ash/shell.h"
20 #include "ash/shell_init_params.h" 21 #include "ash/shell_init_params.h"
21 #include "ash/shell_window_ids.h"
22 #include "ash/sysui/app_list_presenter_mus.h" 22 #include "ash/sysui/app_list_presenter_mus.h"
23 #include "ash/sysui/keyboard_ui_mus.h" 23 #include "ash/sysui/keyboard_ui_mus.h"
24 #include "ash/sysui/shelf_delegate_mus.h" 24 #include "ash/sysui/shelf_delegate_mus.h"
25 #include "ash/sysui/shell_delegate_mus.h" 25 #include "ash/sysui/shell_delegate_mus.h"
26 #include "ash/sysui/stub_context_factory.h" 26 #include "ash/sysui/stub_context_factory.h"
27 #include "base/bind.h" 27 #include "base/bind.h"
28 #include "base/files/file_path.h" 28 #include "base/files/file_path.h"
29 #include "base/path_service.h" 29 #include "base/path_service.h"
30 #include "base/threading/sequenced_worker_pool.h" 30 #include "base/threading/sequenced_worker_pool.h"
31 #include "components/mus/public/cpp/property_type_converters.h" 31 #include "components/mus/public/cpp/property_type_converters.h"
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 void SysUIApplication::Create( 323 void SysUIApplication::Create(
324 ::shell::Connection* connection, 324 ::shell::Connection* connection,
325 mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) { 325 mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) {
326 mash::shelf::mojom::ShelfController* shelf_controller = 326 mash::shelf::mojom::ShelfController* shelf_controller =
327 static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate()); 327 static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate());
328 shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request)); 328 shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
329 } 329 }
330 330
331 } // namespace sysui 331 } // namespace sysui
332 } // namespace ash 332 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698