| 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/extensions/extension_error_reporter.h" | 5 #include "chrome/browser/extensions/extension_error_reporter.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 CHECK(!ui_task_runner_ || ui_task_runner_->BelongsToCurrentThread()) | 70 CHECK(!ui_task_runner_ || ui_task_runner_->BelongsToCurrentThread()) |
| 71 << "ReportError can only be called from the UI thread."; | 71 << "ReportError can only be called from the UI thread."; |
| 72 | 72 |
| 73 errors_.push_back(message); | 73 errors_.push_back(message); |
| 74 | 74 |
| 75 // TODO(aa): Print the error message out somewhere better. I think we are | 75 // TODO(aa): Print the error message out somewhere better. I think we are |
| 76 // going to need some sort of 'extension inspector'. | 76 // going to need some sort of 'extension inspector'. |
| 77 LOG(WARNING) << "Extension error: " << message; | 77 LOG(WARNING) << "Extension error: " << message; |
| 78 | 78 |
| 79 if (enable_noisy_errors_ && be_noisy) { | 79 if (enable_noisy_errors_ && be_noisy) { |
| 80 if (should_postpone_messages_) { |
| 81 postponed_messages_.push_back(message); |
| 82 return; |
| 83 } |
| 80 chrome::ShowWarningMessageBox( | 84 chrome::ShowWarningMessageBox( |
| 81 NULL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOAD_ERROR_HEADING), | 85 NULL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOAD_ERROR_HEADING), |
| 82 message); | 86 message); |
| 83 } | 87 } |
| 84 } | 88 } |
| 85 | 89 |
| 90 void ExtensionErrorReporter::ShowPostponedMessages() { |
| 91 should_postpone_messages_ = false; |
| 92 for (base::string16 message : postponed_messages_) { |
| 93 chrome::ShowWarningMessageBox( |
| 94 NULL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOAD_ERROR_HEADING), |
| 95 message); |
| 96 } |
| 97 postponed_messages_.clear(); |
| 98 } |
| 99 |
| 86 const std::vector<base::string16>* ExtensionErrorReporter::GetErrors() { | 100 const std::vector<base::string16>* ExtensionErrorReporter::GetErrors() { |
| 87 return &errors_; | 101 return &errors_; |
| 88 } | 102 } |
| 89 | 103 |
| 90 void ExtensionErrorReporter::ClearErrors() { | 104 void ExtensionErrorReporter::ClearErrors() { |
| 91 errors_.clear(); | 105 errors_.clear(); |
| 92 } | 106 } |
| 93 | 107 |
| 94 void ExtensionErrorReporter::AddObserver(Observer* observer) { | 108 void ExtensionErrorReporter::AddObserver(Observer* observer) { |
| 95 observers_.AddObserver(observer); | 109 observers_.AddObserver(observer); |
| 96 } | 110 } |
| 97 | 111 |
| 98 void ExtensionErrorReporter::RemoveObserver(Observer* observer) { | 112 void ExtensionErrorReporter::RemoveObserver(Observer* observer) { |
| 99 observers_.RemoveObserver(observer); | 113 observers_.RemoveObserver(observer); |
| 100 } | 114 } |
| OLD | NEW |