ash/app_list/app_list_presenter_delegate.cc - Issue 2268823002: mash: Move more shelf files to ash/common/shelf.

Side by Side Diff: ash/app_list/app_list_presenter_delegate.cc

Issue 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix rebase. 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/accelerators/accelerator_controller_delegate_aura.cc ('k') | ash/ash.gyp » ('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/app_list/app_list_presenter_delegate.h"	5 #include "ash/app_list/app_list_presenter_delegate.h"

6	6

7 #include "ash/aura/wm_window_aura.h"	7 #include "ash/aura/wm_window_aura.h"

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

9 #include "ash/common/shelf/app_list_button.h"	9 #include "ash/common/shelf/app_list_button.h"

	10 #include "ash/common/shelf/shelf.h"

	11 #include "ash/common/shelf/shelf_layout_manager.h"

10 #include "ash/common/shelf/shelf_types.h"	12 #include "ash/common/shelf/shelf_types.h"

11 #include "ash/common/shelf/wm_shelf.h"	13 #include "ash/common/shelf/wm_shelf.h"

12 #include "ash/common/shell_window_ids.h"	14 #include "ash/common/shell_window_ids.h"

13 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"	15 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

14 #include "ash/common/wm/wm_screen_util.h"	16 #include "ash/common/wm/wm_screen_util.h"

15 #include "ash/common/wm_lookup.h"	17 #include "ash/common/wm_lookup.h"

16 #include "ash/common/wm_root_window_controller.h"	18 #include "ash/common/wm_root_window_controller.h"

17 #include "ash/common/wm_shell.h"	19 #include "ash/common/wm_shell.h"

18 #include "ash/common/wm_window.h"	20 #include "ash/common/wm_window.h"

19 #include "ash/display/window_tree_host_manager.h"	21 #include "ash/display/window_tree_host_manager.h"

20 #include "ash/root_window_controller.h"	22 #include "ash/root_window_controller.h"

21 #include "ash/screen_util.h"	23 #include "ash/screen_util.h"

22 #include "ash/shelf/shelf.h"

23 #include "ash/shelf/shelf_layout_manager.h"

24 #include "ash/shell.h"	24 #include "ash/shell.h"

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

26 #include "ui/app_list/app_list_constants.h"	26 #include "ui/app_list/app_list_constants.h"

27 #include "ui/app_list/app_list_switches.h"	27 #include "ui/app_list/app_list_switches.h"

28 #include "ui/app_list/presenter/app_list_presenter.h"	28 #include "ui/app_list/presenter/app_list_presenter.h"

29 #include "ui/app_list/presenter/app_list_view_delegate_factory.h"	29 #include "ui/app_list/presenter/app_list_view_delegate_factory.h"

30 #include "ui/app_list/views/app_list_view.h"	30 #include "ui/app_list/views/app_list_view.h"

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

32 #include "ui/events/event.h"	32 #include "ui/events/event.h"

33 #include "ui/keyboard/keyboard_controller.h"	33 #include "ui/keyboard/keyboard_controller.h"

(...skipping 321 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
355 }	355 }

356	356

357 ////////////////////////////////////////////////////////////////////////////////	357 ////////////////////////////////////////////////////////////////////////////////

358 // AppListPresenterDelegate, WmShelfObserver implementation:	358 // AppListPresenterDelegate, WmShelfObserver implementation:

359	359

360 void AppListPresenterDelegate::OnShelfIconPositionsChanged() {	360 void AppListPresenterDelegate::OnShelfIconPositionsChanged() {

361 UpdateBounds();	361 UpdateBounds();

362 }	362 }

363	363

364 } // namespace ash	364 } // namespace ash

OLD	NEW