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

Unified Diff: chrome/browser/extensions/extension_disabled_ui.cc

Issue 14262009: Add support for multi-line GlobalError messages to Views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_disabled_ui.cc
diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc
index 33b22650ab383c8720d172d096739d02be5717eb..1822853f84755561dbe9aec8796bf3d913e1df89 100644
--- a/chrome/browser/extensions/extension_disabled_ui.cc
+++ b/chrome/browser/extensions/extension_disabled_ui.cc
@@ -142,7 +142,7 @@ class ExtensionDisabledGlobalError : public GlobalError,
virtual void ExecuteMenuItem(Browser* browser) OVERRIDE;
virtual bool HasBubbleView() OVERRIDE;
virtual string16 GetBubbleViewTitle() OVERRIDE;
- virtual string16 GetBubbleViewMessage() OVERRIDE;
+ virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE;
virtual string16 GetBubbleViewAcceptButtonLabel() OVERRIDE;
virtual string16 GetBubbleViewCancelButtonLabel() OVERRIDE;
virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE;
@@ -233,10 +233,12 @@ string16 ExtensionDisabledGlobalError::GetBubbleViewTitle() {
UTF8ToUTF16(extension_->name()));
}
-string16 ExtensionDisabledGlobalError::GetBubbleViewMessage() {
- return l10n_util::GetStringFUTF16(extension_->is_app() ?
+std::vector<string16> ExtensionDisabledGlobalError::GetBubbleViewMessages() {
+ string16 message = l10n_util::GetStringFUTF16(
+ extension_->is_app() ?
IDS_APP_DISABLED_ERROR_LABEL : IDS_EXTENSION_DISABLED_ERROR_LABEL,
UTF8ToUTF16(extension_->name()));
+ return std::vector<string16>(1, message);
}
string16 ExtensionDisabledGlobalError::GetBubbleViewAcceptButtonLabel() {
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_error_ui.h » ('j') | chrome/browser/ui/global_error/global_error.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698