Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Side by Side Diff: ash/wm/session_state_animator.cc

Issue 2659523005: ash: Tune shutdown animation time to 1.5s for convertible devices (Closed)
Patch Set: Created 3 years, 10 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/wm/session_state_animator.h" 5 #include "ash/wm/session_state_animator.h"
6 6
7 #include "ash/common/ash_switches.h" 7 #include "ash/common/ash_switches.h"
8 #include "ash/public/cpp/shell_window_ids.h" 8 #include "ash/public/cpp/shell_window_ids.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/wm/window_animations.h" 10 #include "ash/wm/window_animations.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 return base::TimeDelta::FromMilliseconds(150); 88 return base::TimeDelta::FromMilliseconds(150);
89 case ANIMATION_SPEED_FAST: 89 case ANIMATION_SPEED_FAST:
90 return base::TimeDelta::FromMilliseconds(150); 90 return base::TimeDelta::FromMilliseconds(150);
91 case ANIMATION_SPEED_SHOW_LOCK_SCREEN: 91 case ANIMATION_SPEED_SHOW_LOCK_SCREEN:
92 return base::TimeDelta::FromMilliseconds(200); 92 return base::TimeDelta::FromMilliseconds(200);
93 case ANIMATION_SPEED_MOVE_WINDOWS: 93 case ANIMATION_SPEED_MOVE_WINDOWS:
94 return base::TimeDelta::FromMilliseconds(350); 94 return base::TimeDelta::FromMilliseconds(350);
95 case ANIMATION_SPEED_UNDO_MOVE_WINDOWS: 95 case ANIMATION_SPEED_UNDO_MOVE_WINDOWS:
96 return base::TimeDelta::FromMilliseconds(350); 96 return base::TimeDelta::FromMilliseconds(350);
97 case ANIMATION_SPEED_SHUTDOWN: 97 case ANIMATION_SPEED_SHUTDOWN:
98 return IsTouchViewEnabled() ? base::TimeDelta::FromMilliseconds(2500) 98 return IsTouchViewEnabled() ? base::TimeDelta::FromMilliseconds(1500)
99 : base::TimeDelta::FromMilliseconds(1000); 99 : base::TimeDelta::FromMilliseconds(1000);
100 case ANIMATION_SPEED_REVERT_SHUTDOWN: 100 case ANIMATION_SPEED_REVERT_SHUTDOWN:
101 return base::TimeDelta::FromMilliseconds(500); 101 return base::TimeDelta::FromMilliseconds(500);
102 } 102 }
103 // Satisfy compilers that do not understand that we will return from switch 103 // Satisfy compilers that do not understand that we will return from switch
104 // above anyway. 104 // above anyway.
105 DCHECK(false) << "Unhandled animation speed " << speed; 105 DCHECK(false) << "Unhandled animation speed " << speed;
106 return base::TimeDelta(); 106 return base::TimeDelta();
107 } 107 }
108 108
109 } // namespace ash 109 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698