diff options
Diffstat (limited to 'chromium/chrome/browser/ui/webui/flags_ui.cc')
| -rw-r--r-- | chromium/chrome/browser/ui/webui/flags_ui.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/chromium/chrome/browser/ui/webui/flags_ui.cc b/chromium/chrome/browser/ui/webui/flags_ui.cc index 293a1418a99..43d1559a1cc 100644 --- a/chromium/chrome/browser/ui/webui/flags_ui.cc +++ b/chromium/chrome/browser/ui/webui/flags_ui.cc @@ -61,10 +61,9 @@ content::WebUIDataSource* CreateFlagsUIHTMLSource() { content::WebUIDataSource* source = content::WebUIDataSource::Create(chrome::kChromeUIFlagsHost); - source->AddLocalizedString(flags_ui::kFlagsLongTitle, - IDS_FLAGS_UI_LONG_TITLE); - source->AddLocalizedString(flags_ui::kFlagsTableTitle, - IDS_FLAGS_UI_TABLE_TITLE); + source->AddLocalizedString(flags_ui::kFlagsSearchPlaceholder, + IDS_FLAGS_UI_SEARCH_PLACEHOLDER); + source->AddLocalizedString(flags_ui::kFlagsTitle, IDS_FLAGS_UI_TITLE); source->AddLocalizedString(flags_ui::kFlagsWarningHeader, IDS_FLAGS_UI_WARNING_HEADER); source->AddLocalizedString(flags_ui::kFlagsBlurb, IDS_FLAGS_UI_WARNING_TEXT); @@ -72,8 +71,10 @@ content::WebUIDataSource* CreateFlagsUIHTMLSource() { IDS_FLAGS_UI_PROMOTE_BETA_CHANNEL); source->AddLocalizedString(flags_ui::kChannelPromoDev, IDS_FLAGS_UI_PROMOTE_DEV_CHANNEL); - source->AddLocalizedString(flags_ui::kFlagsUnsupportedTableTitle, - IDS_FLAGS_UI_UNSUPPORTED_TABLE_TITLE); + source->AddLocalizedString(flags_ui::kFlagsSupportedTitle, + IDS_FLAGS_UI_SUPPORTED_TITLE); + source->AddLocalizedString(flags_ui::kFlagsUnsupportedTitle, + IDS_FLAGS_UI_UNSUPPORTED_TITLE); source->AddLocalizedString(flags_ui::kFlagsNotSupported, IDS_FLAGS_UI_NOT_AVAILABLE); source->AddLocalizedString(flags_ui::kFlagsRestartNotice, @@ -82,8 +83,11 @@ content::WebUIDataSource* CreateFlagsUIHTMLSource() { IDS_FLAGS_UI_RELAUNCH_BUTTON); source->AddLocalizedString(flags_ui::kResetAllButton, IDS_FLAGS_UI_RESET_ALL_BUTTON); + source->AddLocalizedString(flags_ui::kFlagsNoMatches, + IDS_FLAGS_UI_NO_MATCHES); source->AddLocalizedString(flags_ui::kDisable, IDS_FLAGS_UI_DISABLE); source->AddLocalizedString(flags_ui::kEnable, IDS_FLAGS_UI_ENABLE); + source->AddString(flags_ui::kVersion, version_info::GetVersionNumber()); #if defined(OS_CHROMEOS) if (!user_manager::UserManager::Get()->IsCurrentUserOwner() && @@ -339,6 +343,6 @@ FlagsUI::~FlagsUI() { // static base::RefCountedMemory* FlagsUI::GetFaviconResourceBytes( ui::ScaleFactor scale_factor) { - return ResourceBundle::GetSharedInstance(). - LoadDataResourceBytesForScale(IDR_FLAGS_FAVICON, scale_factor); + return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( + IDR_FLAGS_FAVICON, scale_factor); } |