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/sync/sync_error_notifier_ash.h" | 5 #include "chrome/browser/sync/sync_error_notifier_ash.h" |
6 | 6 |
7 #include "ash/common/system/system_notifier.h" | 7 #include "ash/common/system/system_notifier.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 // See crbug.com/354280. | 89 // See crbug.com/354280. |
90 login_ui->current_login_ui()->FocusUI(); | 90 login_ui->current_login_ui()->FocusUI(); |
91 return; | 91 return; |
92 } | 92 } |
93 | 93 |
94 chrome::ShowSettingsSubPageForProfile(profile_, chrome::kSyncSetupSubPage); | 94 chrome::ShowSettingsSubPageForProfile(profile_, chrome::kSyncSetupSubPage); |
95 } | 95 } |
96 | 96 |
97 } // namespace | 97 } // namespace |
98 | 98 |
99 SyncErrorNotifier::SyncErrorNotifier(SyncErrorController* controller, | 99 SyncErrorNotifier::SyncErrorNotifier(syncer::SyncErrorController* controller, |
100 Profile* profile) | 100 Profile* profile) |
101 : error_controller_(controller), | 101 : error_controller_(controller), profile_(profile) { |
102 profile_(profile) { | |
103 // Create a unique notification ID for this profile. | 102 // Create a unique notification ID for this profile. |
104 notification_id_ = | 103 notification_id_ = |
105 kProfileSyncNotificationId + profile_->GetProfileUserName(); | 104 kProfileSyncNotificationId + profile_->GetProfileUserName(); |
106 | 105 |
107 error_controller_->AddObserver(this); | 106 error_controller_->AddObserver(this); |
108 OnErrorChanged(); | 107 OnErrorChanged(); |
109 } | 108 } |
110 | 109 |
111 SyncErrorNotifier::~SyncErrorNotifier() { | 110 SyncErrorNotifier::~SyncErrorNotifier() { |
112 DCHECK(!error_controller_) | 111 DCHECK(!error_controller_) |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 message_center::NOTIFICATION_TYPE_SIMPLE, | 171 message_center::NOTIFICATION_TYPE_SIMPLE, |
173 l10n_util::GetStringUTF16(IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE), | 172 l10n_util::GetStringUTF16(IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE), |
174 l10n_util::GetStringUTF16(IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_MESSAGE), | 173 l10n_util::GetStringUTF16(IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_MESSAGE), |
175 ui::ResourceBundle::GetSharedInstance().GetImageNamed( | 174 ui::ResourceBundle::GetSharedInstance().GetImageNamed( |
176 IDR_NOTIFICATION_ALERT), | 175 IDR_NOTIFICATION_ALERT), |
177 notifier_id, | 176 notifier_id, |
178 base::string16(), // display_source | 177 base::string16(), // display_source |
179 GURL(notification_id_), notification_id_, data, delegate); | 178 GURL(notification_id_), notification_id_, data, delegate); |
180 notification_ui_manager->Add(notification, profile_); | 179 notification_ui_manager->Add(notification, profile_); |
181 } | 180 } |
OLD | NEW |