| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 | 58 |
| 59 protected: | 59 protected: |
| 60 ~SigninNotificationDelegate() override; | 60 ~SigninNotificationDelegate() override; |
| 61 | 61 |
| 62 private: | 62 private: |
| 63 void FixSignIn(); | 63 void FixSignIn(); |
| 64 | 64 |
| 65 // Unique id of the notification. | 65 // Unique id of the notification. |
| 66 const std::string id_; | 66 const std::string id_; |
| 67 | 67 |
| 68 #if !defined(OS_CHROMEOS) |
| 68 Profile* profile_; | 69 Profile* profile_; |
| 70 #endif |
| 69 | 71 |
| 70 DISALLOW_COPY_AND_ASSIGN(SigninNotificationDelegate); | 72 DISALLOW_COPY_AND_ASSIGN(SigninNotificationDelegate); |
| 71 }; | 73 }; |
| 72 | 74 |
| 73 SigninNotificationDelegate::SigninNotificationDelegate( | 75 SigninNotificationDelegate::SigninNotificationDelegate(const std::string& id, |
| 74 const std::string& id, | 76 Profile* profile) |
| 75 Profile* profile) | 77 #if defined(OS_CHROMEOS) |
| 76 : id_(id), | 78 : id_(id) { |
| 77 profile_(profile) { | 79 #else |
| 80 : id_(id), profile_(profile) { |
| 81 #endif |
| 78 } | 82 } |
| 79 | 83 |
| 80 SigninNotificationDelegate::~SigninNotificationDelegate() { | 84 SigninNotificationDelegate::~SigninNotificationDelegate() { |
| 81 } | 85 } |
| 82 | 86 |
| 83 void SigninNotificationDelegate::Click() { | 87 void SigninNotificationDelegate::Click() { |
| 84 FixSignIn(); | 88 FixSignIn(); |
| 85 } | 89 } |
| 86 | 90 |
| 87 void SigninNotificationDelegate::ButtonClick(int button_index) { | 91 void SigninNotificationDelegate::ButtonClick(int button_index) { |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 return l10n_util::GetStringUTF16( | 219 return l10n_util::GetStringUTF16( |
| 216 IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE); | 220 IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE); |
| 217 break; | 221 break; |
| 218 | 222 |
| 219 // Generic message for "other" errors. | 223 // Generic message for "other" errors. |
| 220 default: | 224 default: |
| 221 return l10n_util::GetStringUTF16( | 225 return l10n_util::GetStringUTF16( |
| 222 IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE); | 226 IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE); |
| 223 } | 227 } |
| 224 } | 228 } |
| OLD | NEW |