Chromium Code Reviews| Index: chrome/browser/ui/webui/options/extension_settings_handler.h |
| diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.h b/chrome/browser/ui/webui/options/extension_settings_handler.h |
| index d326a1d0bc43b6b3263615b49c53b0a35efda2bb..e5619c5e446c66e13c745e267f6fa2998401b3f7 100644 |
| --- a/chrome/browser/ui/webui/options/extension_settings_handler.h |
| +++ b/chrome/browser/ui/webui/options/extension_settings_handler.h |
| @@ -11,6 +11,7 @@ |
| #include "chrome/browser/extensions/extension_install_ui.h" |
| #include "chrome/browser/extensions/extension_uninstall_dialog.h" |
| +#include "chrome/browser/extensions/extension_warning_set.h" |
| #include "chrome/browser/ui/shell_dialogs.h" |
| #include "chrome/browser/ui/webui/options/options_ui.h" |
| #include "chrome/browser/ui/webui/chrome_web_ui.h" |
| @@ -57,11 +58,12 @@ class ExtensionSettingsHandler : public OptionsPageUIHandler, |
| static void RegisterUserPrefs(PrefService* prefs); |
| // Extension Detail JSON Struct for page. (static for ease of testing). |
| - // Note: service can be NULL in unit tests. |
| + // Note: |service| and |warnings| can be NULL in unit tests. |
| static base::DictionaryValue* CreateExtensionDetailValue( |
| ExtensionService* service, |
| const Extension* extension, |
| const std::vector<ExtensionPage>& pages, |
| + const ExtensionWarningSet* warnings, |
| bool enabled, |
| bool terminated); |
| @@ -163,6 +165,10 @@ class ExtensionSettingsHandler : public OptionsPageUIHandler, |
| // needed. |
| ExtensionUninstallDialog* GetExtensionUninstallDialog(); |
| + // Returns a localized string for |warning_type|. |
| + static string16 GetLocalizedWarning( |
| + ExtensionWarning::WarningType warning_type); |
|
Finnur
2011/10/10 09:59:24
nit: static function should be at the top of the p
battre
2011/10/10 13:16:36
I have moved the function up. I did not move it in
Finnur
2011/10/10 15:06:56
I don't feel strongly about it but if someone adds
battre
2011/10/10 15:55:57
Convinced. Done.
|
| + |
| // Our model. Outlives us since it's owned by our containing profile. |
| ExtensionService* extension_service_; |