| Index: chrome/browser/ui/webui/md_history_ui.cc
|
| diff --git a/chrome/browser/ui/webui/md_history_ui.cc b/chrome/browser/ui/webui/md_history_ui.cc
|
| index 7ef8b01a3460c9d5c4e5e31491c54b26ebb20ec8..381cde7e1f417f6c40911d8e4ef01980019f63cf 100644
|
| --- a/chrome/browser/ui/webui/md_history_ui.cc
|
| +++ b/chrome/browser/ui/webui/md_history_ui.cc
|
| @@ -22,7 +22,6 @@
|
| #include "chrome/grit/generated_resources.h"
|
| #include "chrome/grit/locale_settings.h"
|
| #include "chrome/grit/theme_resources.h"
|
| -#include "components/grit/components_scaled_resources.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| #include "components/prefs/pref_service.h"
|
| #include "components/search/search.h"
|
| @@ -31,7 +30,6 @@
|
| #include "content/public/browser/web_ui.h"
|
| #include "content/public/browser/web_ui_data_source.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| -#include "ui/base/resource/resource_bundle.h"
|
|
|
| namespace {
|
|
|
| @@ -67,8 +65,8 @@ content::WebUIDataSource* CreateMdHistoryUIHTMLSource(Profile* profile,
|
| IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON);
|
| source->AddLocalizedString("deleteSession",
|
| IDS_HISTORY_OTHER_SESSIONS_HIDE_FOR_NOW);
|
| - source->AddLocalizedString(
|
| - "deleteWarning", IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING_NO_INCOGNITO);
|
| + source->AddLocalizedString("deleteWarning",
|
| + IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING);
|
| source->AddLocalizedString("entrySummary", IDS_HISTORY_ENTRY_SUMMARY);
|
| source->AddLocalizedString("expandSessionButton",
|
| IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION);
|
| @@ -95,12 +93,6 @@ content::WebUIDataSource* CreateMdHistoryUIHTMLSource(Profile* profile,
|
| source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS);
|
| source->AddLocalizedString("noSyncedResults",
|
| IDS_MD_HISTORY_NO_SYNCED_RESULTS);
|
| - source->AddLocalizedString("rangeAllTime", IDS_HISTORY_RANGE_ALL_TIME);
|
| - source->AddLocalizedString("rangeWeek", IDS_HISTORY_RANGE_WEEK);
|
| - source->AddLocalizedString("rangeMonth", IDS_HISTORY_RANGE_MONTH);
|
| - source->AddLocalizedString("rangeToday", IDS_HISTORY_RANGE_TODAY);
|
| - source->AddLocalizedString("rangeNext", IDS_HISTORY_RANGE_NEXT);
|
| - source->AddLocalizedString("rangePrevious", IDS_HISTORY_RANGE_PREVIOUS);
|
| source->AddLocalizedString("removeBookmark", IDS_HISTORY_REMOVE_BOOKMARK);
|
| source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
|
| source->AddLocalizedString("removeSelected",
|
| @@ -227,13 +219,6 @@ MdHistoryUI::MdHistoryUI(content::WebUI* web_ui) : WebUIController(web_ui) {
|
|
|
| MdHistoryUI::~MdHistoryUI() {}
|
|
|
| -// static
|
| -base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes(
|
| - ui::ScaleFactor scale_factor) {
|
| - return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
|
| - IDR_HISTORY_FAVICON, scale_factor);
|
| -}
|
| -
|
| void MdHistoryUI::RegisterProfilePrefs(
|
| user_prefs::PrefRegistrySyncable* registry) {
|
| registry->RegisterBooleanPref(prefs::kMdHistoryMenuPromoShown, false,
|
|
|