| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_global_error.h" | 5 #include "chrome/browser/sync/sync_global_error.h" |
| 6 | 6 |
| 7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
| 8 #include "chrome/browser/sync/sync_ui_util.h" | 8 #include "chrome/browser/sync/sync_ui_util.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 LoginUIService* login_ui_service, | 23 LoginUIService* login_ui_service, |
| 24 syncer::SyncErrorController* error_controller, | 24 syncer::SyncErrorController* error_controller, |
| 25 browser_sync::ProfileSyncService* profile_sync_service) | 25 browser_sync::ProfileSyncService* profile_sync_service) |
| 26 : global_error_service_(global_error_service), | 26 : global_error_service_(global_error_service), |
| 27 login_ui_service_(login_ui_service), | 27 login_ui_service_(login_ui_service), |
| 28 error_controller_(error_controller), | 28 error_controller_(error_controller), |
| 29 sync_service_(profile_sync_service) { | 29 sync_service_(profile_sync_service) { |
| 30 DCHECK(sync_service_); | 30 DCHECK(sync_service_); |
| 31 error_controller_->AddObserver(this); | 31 error_controller_->AddObserver(this); |
| 32 if (!switches::IsMaterialDesignUserMenu()) | 32 if (!switches::IsMaterialDesignUserMenu()) |
| 33 global_error_service_->AddGlobalError(this); | 33 global_error_service_->AddUnownedGlobalError(this); |
| 34 } | 34 } |
| 35 | 35 |
| 36 SyncGlobalError::~SyncGlobalError() { | 36 SyncGlobalError::~SyncGlobalError() { |
| 37 DCHECK(!error_controller_) | 37 DCHECK(!error_controller_) |
| 38 << "SyncGlobalError::Shutdown() was not called"; | 38 << "SyncGlobalError::Shutdown() was not called"; |
| 39 } | 39 } |
| 40 | 40 |
| 41 void SyncGlobalError::Shutdown() { | 41 void SyncGlobalError::Shutdown() { |
| 42 if (!switches::IsMaterialDesignUserMenu()) | 42 if (!switches::IsMaterialDesignUserMenu()) |
| 43 global_error_service_->RemoveGlobalError(this); | 43 global_error_service_->RemoveUnownedGlobalError(this); |
| 44 error_controller_->RemoveObserver(this); | 44 error_controller_->RemoveObserver(this); |
| 45 error_controller_ = nullptr; | 45 error_controller_ = nullptr; |
| 46 } | 46 } |
| 47 | 47 |
| 48 bool SyncGlobalError::HasMenuItem() { | 48 bool SyncGlobalError::HasMenuItem() { |
| 49 return !menu_label_.empty(); | 49 return !menu_label_.empty(); |
| 50 } | 50 } |
| 51 | 51 |
| 52 int SyncGlobalError::MenuItemCommandID() { | 52 int SyncGlobalError::MenuItemCommandID() { |
| 53 return IDC_SHOW_SYNC_ERROR; | 53 return IDC_SHOW_SYNC_ERROR; |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 | 115 |
| 116 if (menu_label != menu_label_ || bubble_message != bubble_message_ || | 116 if (menu_label != menu_label_ || bubble_message != bubble_message_ || |
| 117 bubble_accept_label != bubble_accept_label_) { | 117 bubble_accept_label != bubble_accept_label_) { |
| 118 menu_label_ = menu_label; | 118 menu_label_ = menu_label; |
| 119 bubble_message_ = bubble_message; | 119 bubble_message_ = bubble_message; |
| 120 bubble_accept_label_ = bubble_accept_label; | 120 bubble_accept_label_ = bubble_accept_label; |
| 121 | 121 |
| 122 global_error_service_->NotifyErrorsChanged(this); | 122 global_error_service_->NotifyErrorsChanged(this); |
| 123 } | 123 } |
| 124 } | 124 } |
| OLD | NEW |