diff options
Diffstat (limited to 'chrome/browser/ui/webui/extensions')
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc index 39ae6a2..3fdaecf 100644 --- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc +++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc @@ -159,7 +159,7 @@ void KioskAppsHandler::GetLocalizedValues(content::WebUIDataSource* source) { "kioskDisableBailoutShortcutWarningBold", l10n_util::GetStringUTF16( IDS_OPTIONS_KIOSK_DISABLE_BAILOUT_SHORTCUT_WARNING_BOLD)); - const string16 product_os_name = + const base::string16 product_os_name = l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME); source->AddString( "kioskDisableBailoutShortcutWarning", diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index 7fbafa6..1a757c0 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -233,7 +233,7 @@ base::DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue( extension_data->SetBoolean("homepageProvided", ManifestURL::GetHomepageURL(extension).is_valid()); - string16 location_text; + base::string16 location_text; if (Manifest::IsPolicyLocation(extension->location())) { location_text = l10n_util::GetStringUTF16( IDS_OPTIONS_INSTALL_LOCATION_ENTERPRISE); @@ -997,7 +997,7 @@ void ExtensionSettingsHandler::HandleLoadUnpackedExtensionMessage( const base::ListValue* args) { DCHECK(args->empty()); - string16 select_title = + base::string16 select_title = l10n_util::GetStringUTF16(IDS_EXTENSION_LOAD_FROM_DIRECTORY); const int kFileTypeIndex = 0; // No file type information to index. diff --git a/chrome/browser/ui/webui/extensions/pack_extension_handler.cc b/chrome/browser/ui/webui/extensions/pack_extension_handler.cc index 4bb3e4e..49f47c4 100644 --- a/chrome/browser/ui/webui/extensions/pack_extension_handler.cc +++ b/chrome/browser/ui/webui/extensions/pack_extension_handler.cc @@ -169,7 +169,7 @@ void PackExtensionHandler::HandleSelectFilePathMessage( path_to_use = base::FilePath(); } - string16 select_title; + base::string16 select_title; if (operation == "load") { select_title = l10n_util::GetStringUTF16(IDS_EXTENSION_LOAD_FROM_DIRECTORY); } else if (operation == "pem") { |