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

Side by Side Diff: chrome/browser/signin/signin_error_notifier_ash.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 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 | Annotate | Revision Log
OLDNEW
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 "chrome/browser/signin/signin_error_notifier_ash.h" 5 #include "chrome/browser/signin/signin_error_notifier_ash.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "ash/system/system_notifier.h" 9 #include "ash/system/system_notifier.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 return; 156 return;
157 157
158 if (!error_controller_->HasError()) { 158 if (!error_controller_->HasError()) {
159 g_browser_process->notification_ui_manager()->CancelById(notification_id_); 159 g_browser_process->notification_ui_manager()->CancelById(notification_id_);
160 return; 160 return;
161 } 161 }
162 162
163 #if defined(OS_CHROMEOS) 163 #if defined(OS_CHROMEOS)
164 if (chromeos::UserManager::IsInitialized()) { 164 if (chromeos::UserManager::IsInitialized()) {
165 chromeos::UserFlow* user_flow = 165 chromeos::UserFlow* user_flow =
166 chromeos::UserManager::Get()->GetCurrentUserFlow(); 166 chromeos::GetUserManager()->GetCurrentUserFlow();
167 167
168 // Check whether Chrome OS user flow allows launching browser. 168 // Check whether Chrome OS user flow allows launching browser.
169 // Example: Supervised user creation flow which handles token invalidation 169 // Example: Supervised user creation flow which handles token invalidation
170 // itself and notifications should be suppressed. http://crbug.com/359045 170 // itself and notifications should be suppressed. http://crbug.com/359045
171 if (!user_flow->ShouldLaunchBrowser()) 171 if (!user_flow->ShouldLaunchBrowser())
172 return; 172 return;
173 } 173 }
174 #endif 174 #endif
175 175
176 // Add an accept button to sign the user out. 176 // Add an accept button to sign the user out.
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 return l10n_util::GetStringUTF16( 228 return l10n_util::GetStringUTF16(
229 IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE); 229 IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE);
230 break; 230 break;
231 231
232 // Generic message for "other" errors. 232 // Generic message for "other" errors.
233 default: 233 default:
234 return l10n_util::GetStringUTF16( 234 return l10n_util::GetStringUTF16(
235 IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE); 235 IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE);
236 } 236 }
237 } 237 }
OLDNEW
« no previous file with comments | « chrome/browser/signin/chrome_signin_client.cc ('k') | chrome/browser/supervised_user/chromeos/manager_password_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698