OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/webui/history_ui.h" | 5 #include "chrome/browser/ui/webui/history_ui.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS); | 136 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS); |
137 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); | 137 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); |
138 source->AddLocalizedString("removeSelected", | 138 source->AddLocalizedString("removeSelected", |
139 IDS_HISTORY_REMOVE_SELECTED_ITEMS); | 139 IDS_HISTORY_REMOVE_SELECTED_ITEMS); |
140 source->AddLocalizedString("clearAllHistory", | 140 source->AddLocalizedString("clearAllHistory", |
141 IDS_HISTORY_OPEN_CLEAR_BROWSING_DATA_DIALOG); | 141 IDS_HISTORY_OPEN_CLEAR_BROWSING_DATA_DIALOG); |
142 source->AddString( | 142 source->AddString( |
143 "deleteWarning", | 143 "deleteWarning", |
144 l10n_util::GetStringFUTF16(IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING, | 144 l10n_util::GetStringFUTF16(IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING, |
145 base::UTF8ToUTF16(kIncognitoModeShortcut))); | 145 base::UTF8ToUTF16(kIncognitoModeShortcut))); |
| 146 source->AddLocalizedString("removeBookmark", IDS_HISTORY_REMOVE_BOOKMARK); |
146 source->AddLocalizedString("actionMenuDescription", | 147 source->AddLocalizedString("actionMenuDescription", |
147 IDS_HISTORY_ACTION_MENU_DESCRIPTION); | 148 IDS_HISTORY_ACTION_MENU_DESCRIPTION); |
148 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE); | 149 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE); |
149 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); | 150 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); |
150 source->AddLocalizedString("groupByDomainLabel", IDS_GROUP_BY_DOMAIN_LABEL); | 151 source->AddLocalizedString("groupByDomainLabel", IDS_GROUP_BY_DOMAIN_LABEL); |
151 source->AddLocalizedString("rangeLabel", IDS_HISTORY_RANGE_LABEL); | 152 source->AddLocalizedString("rangeLabel", IDS_HISTORY_RANGE_LABEL); |
152 source->AddLocalizedString("rangeAllTime", IDS_HISTORY_RANGE_ALL_TIME); | 153 source->AddLocalizedString("rangeAllTime", IDS_HISTORY_RANGE_ALL_TIME); |
153 source->AddLocalizedString("rangeWeek", IDS_HISTORY_RANGE_WEEK); | 154 source->AddLocalizedString("rangeWeek", IDS_HISTORY_RANGE_WEEK); |
154 source->AddLocalizedString("rangeMonth", IDS_HISTORY_RANGE_MONTH); | 155 source->AddLocalizedString("rangeMonth", IDS_HISTORY_RANGE_MONTH); |
155 source->AddLocalizedString("rangeToday", IDS_HISTORY_RANGE_TODAY); | 156 source->AddLocalizedString("rangeToday", IDS_HISTORY_RANGE_TODAY); |
(...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1005 Profile* profile = Profile::FromWebUI(web_ui); | 1006 Profile* profile = Profile::FromWebUI(web_ui); |
1006 content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile)); | 1007 content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile)); |
1007 } | 1008 } |
1008 | 1009 |
1009 // static | 1010 // static |
1010 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( | 1011 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( |
1011 ui::ScaleFactor scale_factor) { | 1012 ui::ScaleFactor scale_factor) { |
1012 return ResourceBundle::GetSharedInstance(). | 1013 return ResourceBundle::GetSharedInstance(). |
1013 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); | 1014 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); |
1014 } | 1015 } |
OLD | NEW |