| Index: chrome/browser/extensions/chrome_extension_function.cc
|
| diff --git a/chrome/browser/extensions/chrome_extension_function.cc b/chrome/browser/extensions/chrome_extension_function.cc
|
| index d71673a0b44ad92500794f220feaf1e0126605e5..f0f0cfd8890999724827b521229449805ff4bf22 100644
|
| --- a/chrome/browser/extensions/chrome_extension_function.cc
|
| +++ b/chrome/browser/extensions/chrome_extension_function.cc
|
| @@ -37,15 +37,15 @@ ChromeUIThreadExtensionFunction::GetExtensionWindowController() {
|
| return chrome_details_.GetExtensionWindowController();
|
| }
|
|
|
| +void ChromeUIThreadExtensionFunction::SetError(const std::string& error) {
|
| + error_ = error;
|
| +}
|
| +
|
| content::WebContents*
|
| ChromeUIThreadExtensionFunction::GetAssociatedWebContents() {
|
| return chrome_details_.GetAssociatedWebContents();
|
| }
|
|
|
| -void ChromeUIThreadExtensionFunction::SetError(const std::string& error) {
|
| - error_ = error;
|
| -}
|
| -
|
| const std::string& ChromeUIThreadExtensionFunction::GetError() const {
|
| return error_.empty() ? UIThreadExtensionFunction::GetError() : error_;
|
| }
|
|
|