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

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

Issue 2200893002: mash: Partially migrate ash/desktop_background to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mash browser test crash in GetMaxDisplaySizeInNative. Created 4 years, 4 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/shell_factory.h ('k') | ash/test/ui_controls_factory_ash.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/login_status.h"
12 #include "ash/common/material_design/material_design_controller.h" 13 #include "ash/common/material_design/material_design_controller.h"
13 #include "ash/common/shell_window_ids.h" 14 #include "ash/common/shell_window_ids.h"
14 #include "ash/common/wm_shell.h" 15 #include "ash/common/wm_shell.h"
15 #include "ash/desktop_background/desktop_background_controller.h"
16 #include "ash/display/display_manager.h" 16 #include "ash/display/display_manager.h"
17 #include "ash/host/ash_window_tree_host_init_params.h" 17 #include "ash/host/ash_window_tree_host_init_params.h"
18 #include "ash/host/ash_window_tree_host_platform.h" 18 #include "ash/host/ash_window_tree_host_platform.h"
19 #include "ash/public/interfaces/ash_window_type.mojom.h" 19 #include "ash/public/interfaces/ash_window_type.mojom.h"
20 #include "ash/public/interfaces/container.mojom.h" 20 #include "ash/public/interfaces/container.mojom.h"
21 #include "ash/root_window_settings.h" 21 #include "ash/root_window_settings.h"
22 #include "ash/shell.h" 22 #include "ash/shell.h"
23 #include "ash/shell_init_params.h" 23 #include "ash/shell_init_params.h"
24 #include "ash/sysui/app_list_presenter_mus.h" 24 #include "ash/sysui/app_list_presenter_mus.h"
25 #include "ash/sysui/keyboard_ui_mus.h" 25 #include "ash/sysui/keyboard_ui_mus.h"
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 mojom::WallpaperControllerRequest request) { 341 mojom::WallpaperControllerRequest request) {
342 mojom::WallpaperController* wallpaper_controller = 342 mojom::WallpaperController* wallpaper_controller =
343 static_cast<UserWallpaperDelegateMus*>( 343 static_cast<UserWallpaperDelegateMus*>(
344 Shell::GetInstance()->user_wallpaper_delegate()); 344 Shell::GetInstance()->user_wallpaper_delegate());
345 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, 345 wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
346 std::move(request)); 346 std::move(request));
347 } 347 }
348 348
349 } // namespace sysui 349 } // namespace sysui
350 } // namespace ash 350 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell_factory.h ('k') | ash/test/ui_controls_factory_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698