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/common/profile_management_switches.h" | 5 #include "chrome/common/profile_management_switches.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/metrics/field_trial.h" | 8 #include "base/metrics/field_trial.h" |
9 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
10 | 10 |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 return | 53 return |
54 CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewAvatarMenu) || | 54 CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewAvatarMenu) || |
55 IsNewProfileManagement(); | 55 IsNewProfileManagement(); |
56 } | 56 } |
57 | 57 |
58 bool IsNewProfileManagement() { | 58 bool IsNewProfileManagement() { |
59 return CheckProfileManagementFlag(switches::kNewProfileManagement, true); | 59 return CheckProfileManagementFlag(switches::kNewProfileManagement, true); |
60 } | 60 } |
61 | 61 |
62 bool IsFastUserSwitching() { | 62 bool IsFastUserSwitching() { |
| 63 bool is_just_new_menu = |
| 64 CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewAvatarMenu) && |
| 65 !IsNewProfileManagement(); |
63 return CommandLine::ForCurrentProcess()->HasSwitch( | 66 return CommandLine::ForCurrentProcess()->HasSwitch( |
64 switches::kFastUserSwitching); | 67 switches::kFastUserSwitching) || is_just_new_menu; |
65 } | 68 } |
66 | 69 |
67 } // namespace switches | 70 } // namespace switches |
OLD | NEW |