Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

Side by Side Diff: chrome/browser/extensions/extension_error_reporter.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 13 matching lines...) Expand all
24 24
25 // static 25 // static
26 void ExtensionErrorReporter::Init(bool enable_noisy_errors) { 26 void ExtensionErrorReporter::Init(bool enable_noisy_errors) {
27 if (!instance_) { 27 if (!instance_) {
28 instance_ = new ExtensionErrorReporter(enable_noisy_errors); 28 instance_ = new ExtensionErrorReporter(enable_noisy_errors);
29 } 29 }
30 } 30 }
31 31
32 // static 32 // static
33 ExtensionErrorReporter* ExtensionErrorReporter::GetInstance() { 33 ExtensionErrorReporter* ExtensionErrorReporter::GetInstance() {
34 CHECK(instance_) << "Init() was never called"; 34 // Init() was never called
35 CHECK(instance_);
35 return instance_; 36 return instance_;
36 } 37 }
37 38
38 ExtensionErrorReporter::ExtensionErrorReporter(bool enable_noisy_errors) 39 ExtensionErrorReporter::ExtensionErrorReporter(bool enable_noisy_errors)
39 : enable_noisy_errors_(enable_noisy_errors) { 40 : enable_noisy_errors_(enable_noisy_errors) {
40 if (base::ThreadTaskRunnerHandle::IsSet()) 41 if (base::ThreadTaskRunnerHandle::IsSet())
41 ui_task_runner_ = base::ThreadTaskRunnerHandle::Get(); 42 ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
42 } 43 }
43 44
44 ExtensionErrorReporter::~ExtensionErrorReporter() {} 45 ExtensionErrorReporter::~ExtensionErrorReporter() {}
(...skipping 15 matching lines...) Expand all
60 path_str.c_str(), 61 path_str.c_str(),
61 error.c_str())); 62 error.c_str()));
62 ReportError(message, be_noisy); 63 ReportError(message, be_noisy);
63 for (auto& observer : observers_) 64 for (auto& observer : observers_)
64 observer.OnLoadFailure(browser_context, extension_path, error); 65 observer.OnLoadFailure(browser_context, extension_path, error);
65 } 66 }
66 67
67 void ExtensionErrorReporter::ReportError(const base::string16& message, 68 void ExtensionErrorReporter::ReportError(const base::string16& message,
68 bool be_noisy) { 69 bool be_noisy) {
69 // NOTE: There won't be a |ui_task_runner_| in the unit test environment. 70 // NOTE: There won't be a |ui_task_runner_| in the unit test environment.
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 CHECK(!ui_task_runner_ || ui_task_runner_->BelongsToCurrentThread());
72 73
73 errors_.push_back(message); 74 errors_.push_back(message);
74 75
75 // TODO(aa): Print the error message out somewhere better. I think we are 76 // TODO(aa): Print the error message out somewhere better. I think we are
76 // going to need some sort of 'extension inspector'. 77 // going to need some sort of 'extension inspector'.
77 LOG(WARNING) << "Extension error: " << message; 78 LOG(WARNING) << "Extension error: " << message;
78 79
79 if (enable_noisy_errors_ && be_noisy) { 80 if (enable_noisy_errors_ && be_noisy) {
80 chrome::ShowWarningMessageBox( 81 chrome::ShowWarningMessageBox(
81 NULL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOAD_ERROR_HEADING), 82 NULL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOAD_ERROR_HEADING),
82 message); 83 message);
83 } 84 }
84 } 85 }
85 86
86 const std::vector<base::string16>* ExtensionErrorReporter::GetErrors() { 87 const std::vector<base::string16>* ExtensionErrorReporter::GetErrors() {
87 return &errors_; 88 return &errors_;
88 } 89 }
89 90
90 void ExtensionErrorReporter::ClearErrors() { 91 void ExtensionErrorReporter::ClearErrors() {
91 errors_.clear(); 92 errors_.clear();
92 } 93 }
93 94
94 void ExtensionErrorReporter::AddObserver(Observer* observer) { 95 void ExtensionErrorReporter::AddObserver(Observer* observer) {
95 observers_.AddObserver(observer); 96 observers_.AddObserver(observer);
96 } 97 }
97 98
98 void ExtensionErrorReporter::RemoveObserver(Observer* observer) { 99 void ExtensionErrorReporter::RemoveObserver(Observer* observer) {
99 observers_.RemoveObserver(observer); 100 observers_.RemoveObserver(observer);
100 } 101 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698