ash/shelf/shelf_layout_manager.cc - Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common

Side by Side Diff: ash/shelf/shelf_layout_manager.cc

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel

Patch Set: 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/session/session_state_delegate.h ('K') | « ash/session/session_types.h ('k') | ash/shelf/shelf_layout_manager_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/shelf/shelf_layout_manager.h"	5 #include "ash/shelf/shelf_layout_manager.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <cmath>	8 #include <cmath>

9 #include <cstring>	9 #include <cstring>

10 #include <string>	10 #include <string>

11 #include <vector>	11 #include <vector>

12	12

13 #include "ash/accelerators/accelerator_commands.h"	13 #include "ash/accelerators/accelerator_commands.h"

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

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

	16 #include "ash/common/session/session_state_delegate.h"

16 #include "ash/common/shelf/shelf_constants.h"	17 #include "ash/common/shelf/shelf_constants.h"

17 #include "ash/common/shelf/wm_shelf_util.h"	18 #include "ash/common/shelf/wm_shelf_util.h"

18 #include "ash/common/shell_window_ids.h"	19 #include "ash/common/shell_window_ids.h"

19 #include "ash/common/wm/window_state.h"	20 #include "ash/common/wm/window_state.h"

20 #include "ash/common/wm_root_window_controller.h"	21 #include "ash/common/wm_root_window_controller.h"

21 #include "ash/common/wm_root_window_controller_observer.h"	22 #include "ash/common/wm_root_window_controller_observer.h"

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

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

24 #include "ash/session/session_state_delegate.h"

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

26 #include "ash/shelf/shelf_bezel_event_filter.h"	26 #include "ash/shelf/shelf_bezel_event_filter.h"

27 #include "ash/shelf/shelf_delegate.h"	27 #include "ash/shelf/shelf_delegate.h"

28 #include "ash/shelf/shelf_layout_manager_observer.h"	28 #include "ash/shelf/shelf_layout_manager_observer.h"

29 #include "ash/shelf/shelf_util.h"	29 #include "ash/shelf/shelf_util.h"

30 #include "ash/shelf/shelf_widget.h"	30 #include "ash/shelf/shelf_widget.h"

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

32 #include "ash/system/status_area_widget.h"	32 #include "ash/system/status_area_widget.h"

33 #include "ash/wm/gestures/shelf_gesture_handler.h"	33 #include "ash/wm/gestures/shelf_gesture_handler.h"

34 #include "ash/wm/lock_state_controller.h"	34 #include "ash/wm/lock_state_controller.h"

(...skipping 1157 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1192 UpdateBoundsAndOpacity(target_bounds, true, NULL);	1192 UpdateBoundsAndOpacity(target_bounds, true, NULL);

1193 UpdateVisibilityState();	1193 UpdateVisibilityState();

1194 }	1194 }

1195	1195

1196 void ShelfLayoutManager::UpdateShelfVisibilityAfterLoginUIChange() {	1196 void ShelfLayoutManager::UpdateShelfVisibilityAfterLoginUIChange() {

1197 UpdateVisibilityState();	1197 UpdateVisibilityState();

1198 LayoutShelf();	1198 LayoutShelf();

1199 }	1199 }

1200	1200

1201 } // namespace ash	1201 } // namespace ash

OLD	NEW