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 "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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
176 // Set |profile_id| for multi-user notification blocker. | 176 // Set |profile_id| for multi-user notification blocker. |
177 notifier_id.profile_id = multi_user_util::GetUserIDFromProfile(profile_); | 177 notifier_id.profile_id = multi_user_util::GetUserIDFromProfile(profile_); |
178 | 178 |
179 Notification notification( | 179 Notification notification( |
180 message_center::NOTIFICATION_TYPE_SIMPLE, | 180 message_center::NOTIFICATION_TYPE_SIMPLE, |
181 GURL(notification_id_), | 181 GURL(notification_id_), |
182 l10n_util::GetStringUTF16(IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE), | 182 l10n_util::GetStringUTF16(IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE), |
183 GetMessageBody(), | 183 GetMessageBody(), |
184 ui::ResourceBundle::GetSharedInstance().GetImageNamed( | 184 ui::ResourceBundle::GetSharedInstance().GetImageNamed( |
185 IDR_NOTIFICATION_ALERT), | 185 IDR_NOTIFICATION_ALERT), |
186 blink::WebTextDirectionDefault, | |
187 notifier_id, | 186 notifier_id, |
188 base::string16(), // display_source | 187 base::string16(), // display_source |
189 base::ASCIIToUTF16(notification_id_), | 188 base::ASCIIToUTF16(notification_id_), |
190 data, | 189 data, |
191 delegate); | 190 delegate); |
192 | 191 |
193 // Update or add the notification. | 192 // Update or add the notification. |
194 if (notification_ui_manager->FindById( | 193 if (notification_ui_manager->FindById( |
195 notification_id_, NotificationUIManager::GetProfileID(profile_))) | 194 notification_id_, NotificationUIManager::GetProfileID(profile_))) |
196 notification_ui_manager->Update(notification, profile_); | 195 notification_ui_manager->Update(notification, profile_); |
(...skipping 19 matching lines...) Expand all Loading... |
216 return l10n_util::GetStringUTF16( | 215 return l10n_util::GetStringUTF16( |
217 IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE); | 216 IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE); |
218 break; | 217 break; |
219 | 218 |
220 // Generic message for "other" errors. | 219 // Generic message for "other" errors. |
221 default: | 220 default: |
222 return l10n_util::GetStringUTF16( | 221 return l10n_util::GetStringUTF16( |
223 IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE); | 222 IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE); |
224 } | 223 } |
225 } | 224 } |
OLD | NEW |