diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/extension_settings_handler.cc | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 777410e..b6ceacc 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4209,15 +4209,12 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_EXTENSION_WEB_STORE_TITLE" desc="Text for the Chrome Web Store"> Web Store </message> - - <!-- TODO(dmazzoni) uncomment these strings once this change is merged. <message name="IDS_EXTENSIONS_SHOW_DETAILS" desc="Tooltip for the button next to an extension that shows more details"> Show Details </message> <message name="IDS_EXTENSIONS_HIDE_DETAILS" desc="Tooltip for the button next to an extension that hides details"> Hide Details </message> - --> <!-- Global error messages for extensions --> <message name="IDS_EXTENSION_WARNINGS_WRENCH_MENU_ITEM" desc="The wrench menu item indicating that extensions caused problems"> diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc index 55b64a9..f8c3fc5 100644 --- a/chrome/browser/ui/webui/options/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc @@ -566,12 +566,10 @@ void ExtensionSettingsHandler::GetLocalizedValues( l10n_util::GetStringUTF16(IDS_EXTENSIONS_IN_DEVELOPMENT)); localized_strings->SetString("extensionSettingsWarningsTitle", l10n_util::GetStringUTF16(IDS_EXTENSION_WARNINGS_TITLE)); - - // TODO(dmazzoni): Uncomment these strings once this change is merged. localized_strings->SetString("extensionSettingsShowDetails", - ""); // l10n_util::GetStringUTF16(IDS_EXTENSIONS_SHOW_DETAILS)); + l10n_util::GetStringUTF16(IDS_EXTENSIONS_SHOW_DETAILS)); localized_strings->SetString("extensionSettingsHideDetails", - ""); // l10n_util::GetStringUTF16(IDS_EXTENSIONS_HIDE_DETAILS)); + l10n_util::GetStringUTF16(IDS_EXTENSIONS_HIDE_DETAILS)); } void ExtensionSettingsHandler::Initialize() { |