chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc - Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)

Patch Set: rebase again Created 4 years, 3 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 | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc ('k') | chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"	5 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.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/multi_profile_uma.h"	9 #include "ash/common/multi_profile_uma.h"

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

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

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

13 #include "ash/common/system/tray/system_tray_notifier.h"	12 #include "ash/common/system/tray/system_tray_notifier.h"

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

15 #include "ash/common/wm/window_state.h"	14 #include "ash/common/wm/window_state.h"

16 #include "ash/common/wm_shell.h"	15 #include "ash/common/wm_shell.h"

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

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

19 #include "ash/wm/window_state_aura.h"	18 #include "ash/wm/window_state_aura.h"

20 #include "base/auto_reset.h"	19 #include "base/auto_reset.h"

21 #include "base/macros.h"	20 #include "base/macros.h"

(...skipping 732 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
754 window->Hide();	753 window->Hide();

755 }	754 }

756	755

757 int MultiUserWindowManagerChromeOS::GetAdjustedAnimationTimeInMS(	756 int MultiUserWindowManagerChromeOS::GetAdjustedAnimationTimeInMS(

758 int default_time_in_ms) const {	757 int default_time_in_ms) const {

759 return animation_speed_ == ANIMATION_SPEED_NORMAL ? default_time_in_ms :	758 return animation_speed_ == ANIMATION_SPEED_NORMAL ? default_time_in_ms :

760 (animation_speed_ == ANIMATION_SPEED_FAST ? 10 : 0);	759 (animation_speed_ == ANIMATION_SPEED_FAST ? 10 : 0);

761 }	760 }

762	761

763 } // namespace chrome	762 } // namespace chrome

OLD	NEW