| Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| index 7c7eda286072d5af9019e7341d33906edcb00214..825e86037a2af75a91e103d8414f81b3346756a3 100644
|
| --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| @@ -160,9 +160,6 @@ DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
|
| extension_data->SetBoolean("wantsFileAccess", extension->wants_file_access());
|
| extension_data->SetBoolean("allowFileAccess",
|
| extension_service_->AllowFileAccess(extension));
|
| - extension_data->SetBoolean("allow_activity",
|
| - enabled && CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableExtensionActivityUI));
|
| extension_data->SetBoolean("allow_reload",
|
| Manifest::IsUnpackedLocation(extension->location()));
|
| extension_data->SetBoolean("is_hosted_app", extension->is_hosted_app());
|
| @@ -308,8 +305,6 @@ void ExtensionSettingsHandler::GetLocalizedValues(
|
| l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS_LINK));
|
| source->AddString("extensionSettingsPermissions",
|
| l10n_util::GetStringUTF16(IDS_EXTENSIONS_PERMISSIONS_LINK));
|
| - source->AddString("extensionSettingsActivity",
|
| - l10n_util::GetStringUTF16(IDS_EXTENSIONS_ACTIVITY_LINK));
|
| source->AddString("extensionSettingsVisitWebsite",
|
| l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSITE));
|
| source->AddString("extensionSettingsVisitWebStore",
|
|
|