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

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

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
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"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/lifetime/application_lifetime.h" 14 #include "chrome/browser/lifetime/application_lifetime.h"
15 #include "chrome/browser/notifications/notification.h" 15 #include "chrome/browser/notifications/notification.h"
16 #include "chrome/browser/notifications/notification_delegate.h" 16 #include "chrome/browser/notifications/notification_delegate.h"
17 #include "chrome/browser/notifications/notification_ui_manager.h" 17 #include "chrome/browser/notifications/notification_ui_manager.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 19 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
20 #include "chrome/browser/ui/browser_tabstrip.h" 20 #include "chrome/browser/ui/browser_tabstrip.h"
21 #include "chrome/browser/ui/browser_window.h" 21 #include "chrome/browser/ui/browser_window.h"
22 #include "chrome/browser/ui/chrome_pages.h" 22 #include "chrome/browser/ui/chrome_pages.h"
23 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" 23 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
24 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 24 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
25 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 25 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
26 #include "chrome/common/url_constants.h" 26 #include "chrome/common/url_constants.h"
27 #include "chrome/grit/chromium_strings.h" 27 #include "chrome/grit/chromium_strings.h"
28 #include "chrome/grit/generated_resources.h" 28 #include "chrome/grit/generated_resources.h"
29 #include "components/user_manager/user_id.h"
29 #include "grit/theme_resources.h" 30 #include "grit/theme_resources.h"
30 #include "third_party/WebKit/public/web/WebTextDirection.h" 31 #include "third_party/WebKit/public/web/WebTextDirection.h"
31 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
32 #include "ui/base/resource/resource_bundle.h" 33 #include "ui/base/resource/resource_bundle.h"
33 #include "ui/message_center/notification.h" 34 #include "ui/message_center/notification.h"
34 #include "ui/message_center/notification_delegate.h" 35 #include "ui/message_center/notification_delegate.h"
35 36
36 #if defined(OS_CHROMEOS) 37 #if defined(OS_CHROMEOS)
37 #include "chrome/browser/chromeos/login/user_flow.h" 38 #include "chrome/browser/chromeos/login/user_flow.h"
38 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 39 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 169
169 // Set the delegate for the notification's sign-out button. 170 // Set the delegate for the notification's sign-out button.
170 SigninNotificationDelegate* delegate = 171 SigninNotificationDelegate* delegate =
171 new SigninNotificationDelegate(notification_id_, profile_); 172 new SigninNotificationDelegate(notification_id_, profile_);
172 173
173 message_center::NotifierId notifier_id( 174 message_center::NotifierId notifier_id(
174 message_center::NotifierId::SYSTEM_COMPONENT, 175 message_center::NotifierId::SYSTEM_COMPONENT,
175 kProfileSigninNotificationId); 176 kProfileSigninNotificationId);
176 177
177 // Set |profile_id| for multi-user notification blocker. 178 // Set |profile_id| for multi-user notification blocker.
178 notifier_id.profile_id = multi_user_util::GetUserIDFromProfile(profile_); 179 notifier_id.profile_id = multi_user_util::GetUserIDFromProfile(profile_).GetUs erEmail();
179 180
180 Notification notification( 181 Notification notification(
181 message_center::NOTIFICATION_TYPE_SIMPLE, 182 message_center::NOTIFICATION_TYPE_SIMPLE,
182 GURL(notification_id_), 183 GURL(notification_id_),
183 l10n_util::GetStringUTF16(IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE), 184 l10n_util::GetStringUTF16(IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE),
184 GetMessageBody(), 185 GetMessageBody(),
185 ui::ResourceBundle::GetSharedInstance().GetImageNamed( 186 ui::ResourceBundle::GetSharedInstance().GetImageNamed(
186 IDR_NOTIFICATION_ALERT), 187 IDR_NOTIFICATION_ALERT),
187 notifier_id, 188 notifier_id,
188 base::string16(), // display_source 189 base::string16(), // display_source
(...skipping 27 matching lines...) Expand all
216 return l10n_util::GetStringUTF16( 217 return l10n_util::GetStringUTF16(
217 IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE); 218 IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE);
218 break; 219 break;
219 220
220 // Generic message for "other" errors. 221 // Generic message for "other" errors.
221 default: 222 default:
222 return l10n_util::GetStringUTF16( 223 return l10n_util::GetStringUTF16(
223 IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE); 224 IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE);
224 } 225 }
225 } 226 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698