ash/shelf/shelf_layout_manager.cc - Issue 2041233004: mash: Move //ash/session to //ash/common/session

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

Issue 2041233004: mash: Move //ash/session to //ash/common/session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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/shelf/shelf_layout_manager.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/mru_window_tracker.h"	20 #include "ash/common/wm/mru_window_tracker.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

36 #include "ash/wm/window_animations.h"	36 #include "ash/wm/window_animations.h"

37 #include "ash/wm/window_state_aura.h"	37 #include "ash/wm/window_state_aura.h"

38 #include "ash/wm/window_util.h"	38 #include "ash/wm/window_util.h"

39 #include "ash/wm/workspace_controller.h"	39 #include "ash/wm/workspace_controller.h"

40 #include "base/auto_reset.h"	40 #include "base/auto_reset.h"

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

42 #include "base/command_line.h"

43 #include "base/i18n/rtl.h"	42 #include "base/i18n/rtl.h"

44 #include "base/strings/string_number_conversions.h"	43 #include "base/strings/string_number_conversions.h"

45 #include "base/strings/string_util.h"	44 #include "base/strings/string_util.h"

46 #include "ui/aura/client/cursor_client.h"	45 #include "ui/aura/client/cursor_client.h"

47 #include "ui/aura/window_event_dispatcher.h"	46 #include "ui/aura/window_event_dispatcher.h"

48 #include "ui/base/ui_base_switches.h"	47 #include "ui/base/ui_base_switches.h"

49 #include "ui/compositor/layer.h"	48 #include "ui/compositor/layer.h"

50 #include "ui/compositor/layer_animation_observer.h"	49 #include "ui/compositor/layer_animation_observer.h"

51 #include "ui/compositor/layer_animator.h"	50 #include "ui/compositor/layer_animator.h"

52 #include "ui/compositor/scoped_layer_animation_settings.h"	51 #include "ui/compositor/scoped_layer_animation_settings.h"

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

1193 UpdateVisibilityState();	1192 UpdateVisibilityState();

1194 }	1193 }

1195	1194

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

1197 UpdateVisibilityState();	1196 UpdateVisibilityState();

1198 LayoutShelf();	1197 LayoutShelf();

1199 }	1198 }

1200	1199

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

OLD	NEW