ash/desktop_background/desktop_background_controller.cc - Issue 2025413002: Moves RootWindowControllerCommon and LayoutManager to common

Side by Side Diff: ash/desktop_background/desktop_background_controller.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: add back static_assert 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

« ash/common/shell_window_ids.h ('K') | « ash/container_delegate_aura.cc ('k') | ash/desktop_background/desktop_background_controller_unittest.cc » ('j') | no next file with comments »

OLD	NEW
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/desktop_background/desktop_background_controller.h"	5 #include "ash/desktop_background/desktop_background_controller.h"

6	6

7 #include "ash/ash_switches.h"	7 #include "ash/ash_switches.h"

	8 #include "ash/common/shell_window_ids.h"

	9 #include "ash/common/wm/root_window_layout_manager.h"

8 #include "ash/desktop_background/desktop_background_controller_observer.h"	10 #include "ash/desktop_background/desktop_background_controller_observer.h"

9 #include "ash/desktop_background/desktop_background_view.h"	11 #include "ash/desktop_background/desktop_background_view.h"

10 #include "ash/desktop_background/desktop_background_widget_controller.h"	12 #include "ash/desktop_background/desktop_background_widget_controller.h"

11 #include "ash/desktop_background/user_wallpaper_delegate.h"	13 #include "ash/desktop_background/user_wallpaper_delegate.h"

12 #include "ash/display/display_info.h"	14 #include "ash/display/display_info.h"

13 #include "ash/display/display_manager.h"	15 #include "ash/display/display_manager.h"

14 #include "ash/root_window_controller.h"	16 #include "ash/root_window_controller.h"

15 #include "ash/shell.h"	17 #include "ash/shell.h"

16 #include "ash/shell_factory.h"	18 #include "ash/shell_factory.h"

17 #include "ash/shell_window_ids.h"

18 #include "ash/wm/root_window_layout_manager.h"

19 #include "base/bind.h"	19 #include "base/bind.h"

20 #include "base/command_line.h"	20 #include "base/command_line.h"

21 #include "base/files/file_util.h"	21 #include "base/files/file_util.h"

22 #include "base/logging.h"	22 #include "base/logging.h"

23 #include "base/synchronization/cancellation_flag.h"	23 #include "base/synchronization/cancellation_flag.h"

24 #include "base/threading/sequenced_worker_pool.h"	24 #include "base/threading/sequenced_worker_pool.h"

25 #include "components/wallpaper/wallpaper_resizer.h"	25 #include "components/wallpaper/wallpaper_resizer.h"

26 #include "ui/aura/window.h"	26 #include "ui/aura/window.h"

27 #include "ui/aura/window_event_dispatcher.h"	27 #include "ui/aura/window_event_dispatcher.h"

28 #include "ui/compositor/layer.h"	28 #include "ui/compositor/layer.h"

(...skipping 247 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
276 : kShellWindowId_DesktopBackgroundContainer;	276 : kShellWindowId_DesktopBackgroundContainer;

277 }	277 }

278	278

279 void DesktopBackgroundController::UpdateWallpaper(bool clear_cache) {	279 void DesktopBackgroundController::UpdateWallpaper(bool clear_cache) {

280 current_wallpaper_.reset(NULL);	280 current_wallpaper_.reset(NULL);

281 ash::Shell::GetInstance()->user_wallpaper_delegate()->UpdateWallpaper(	281 ash::Shell::GetInstance()->user_wallpaper_delegate()->UpdateWallpaper(

282 clear_cache);	282 clear_cache);

283 }	283 }

284	284

285 } // namespace ash	285 } // namespace ash

OLD	NEW