OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/signin/core/common/profile_management_switches.h" | 5 #include "components/signin/core/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 "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "components/signin/core/common/signin_switches.h" | 10 #include "components/signin/core/common/signin_switches.h" |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 | 144 |
145 bool IsGoogleProfileInfo() { | 145 bool IsGoogleProfileInfo() { |
146 return CheckFlag(switches::kGoogleProfileInfo, STATE_NEW_AVATAR_MENU); | 146 return CheckFlag(switches::kGoogleProfileInfo, STATE_NEW_AVATAR_MENU); |
147 } | 147 } |
148 | 148 |
149 bool IsNewAvatarMenu() { | 149 bool IsNewAvatarMenu() { |
150 // NewAvatarMenu is only available on desktop. | 150 // NewAvatarMenu is only available on desktop. |
151 #if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_CHROMEOS) | 151 #if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_CHROMEOS) |
152 return false; | 152 return false; |
153 #else | 153 #else |
154 return GetProcessState() >= STATE_NEW_AVATAR_MENU; | 154 return true; |
155 #endif | 155 #endif |
156 } | 156 } |
157 | 157 |
158 bool IsNewProfileManagement() { | 158 bool IsNewProfileManagement() { |
159 return GetProcessState() >= STATE_NEW_PROFILE_MANAGEMENT; | 159 return GetProcessState() >= STATE_NEW_PROFILE_MANAGEMENT; |
160 } | 160 } |
161 | 161 |
162 bool IsNewProfileManagementPreviewEnabled() { | 162 bool IsNewProfileManagementPreviewEnabled() { |
163 // No promotion to Enable Account Consistency. | 163 // No promotion to Enable Account Consistency. |
164 return false; | 164 return false; |
(...skipping 13 matching lines...) Expand all Loading... |
178 command_line->AppendSwitch(switches::kEnableNewProfileManagement); | 178 command_line->AppendSwitch(switches::kEnableNewProfileManagement); |
179 DCHECK(!command_line->HasSwitch(switches::kDisableNewProfileManagement)); | 179 DCHECK(!command_line->HasSwitch(switches::kDisableNewProfileManagement)); |
180 } | 180 } |
181 | 181 |
182 void EnableAccountConsistencyForTesting(base::CommandLine* command_line) { | 182 void EnableAccountConsistencyForTesting(base::CommandLine* command_line) { |
183 command_line->AppendSwitch(switches::kEnableAccountConsistency); | 183 command_line->AppendSwitch(switches::kEnableAccountConsistency); |
184 DCHECK(!command_line->HasSwitch(switches::kDisableAccountConsistency)); | 184 DCHECK(!command_line->HasSwitch(switches::kDisableAccountConsistency)); |
185 } | 185 } |
186 | 186 |
187 } // namespace switches | 187 } // namespace switches |
OLD | NEW |