| 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 IDS_NEW_TAB_OTHER_SESSIONS_EXPAND_SESSION); | 123 IDS_NEW_TAB_OTHER_SESSIONS_EXPAND_SESSION); |
| 124 source->AddLocalizedString("restoreSessionMenuItemText", | 124 source->AddLocalizedString("restoreSessionMenuItemText", |
| 125 IDS_NEW_TAB_OTHER_SESSIONS_OPEN_ALL); | 125 IDS_NEW_TAB_OTHER_SESSIONS_OPEN_ALL); |
| 126 source->AddLocalizedString("xMore", IDS_OTHER_DEVICES_X_MORE); | 126 source->AddLocalizedString("xMore", IDS_OTHER_DEVICES_X_MORE); |
| 127 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); | 127 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); |
| 128 source->AddLocalizedString("title", IDS_HISTORY_TITLE); | 128 source->AddLocalizedString("title", IDS_HISTORY_TITLE); |
| 129 source->AddLocalizedString("newest", IDS_HISTORY_NEWEST); | 129 source->AddLocalizedString("newest", IDS_HISTORY_NEWEST); |
| 130 source->AddLocalizedString("newer", IDS_HISTORY_NEWER); | 130 source->AddLocalizedString("newer", IDS_HISTORY_NEWER); |
| 131 source->AddLocalizedString("older", IDS_HISTORY_OLDER); | 131 source->AddLocalizedString("older", IDS_HISTORY_OLDER); |
| 132 source->AddLocalizedString("searchResultsFor", IDS_HISTORY_SEARCHRESULTSFOR); | 132 source->AddLocalizedString("searchResultsFor", IDS_HISTORY_SEARCHRESULTSFOR); |
| 133 source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT); |
| 134 source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS); |
| 135 source->AddLocalizedString("foundSearchResults", |
| 136 IDS_HISTORY_FOUND_SEARCH_RESULTS); |
| 133 source->AddLocalizedString("history", IDS_HISTORY_BROWSERESULTS); | 137 source->AddLocalizedString("history", IDS_HISTORY_BROWSERESULTS); |
| 134 source->AddLocalizedString("cont", IDS_HISTORY_CONTINUED); | 138 source->AddLocalizedString("cont", IDS_HISTORY_CONTINUED); |
| 135 source->AddLocalizedString("searchButton", IDS_HISTORY_SEARCH_BUTTON); | 139 source->AddLocalizedString("searchButton", IDS_HISTORY_SEARCH_BUTTON); |
| 136 source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS); | 140 source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS); |
| 137 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS); | 141 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS); |
| 138 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); | 142 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); |
| 139 source->AddLocalizedString("removeSelected", | 143 source->AddLocalizedString("removeSelected", |
| 140 IDS_HISTORY_REMOVE_SELECTED_ITEMS); | 144 IDS_HISTORY_REMOVE_SELECTED_ITEMS); |
| 141 source->AddLocalizedString("clearAllHistory", | 145 source->AddLocalizedString("clearAllHistory", |
| 142 IDS_HISTORY_OPEN_CLEAR_BROWSING_DATA_DIALOG); | 146 IDS_HISTORY_OPEN_CLEAR_BROWSING_DATA_DIALOG); |
| (...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1018 Profile* profile = Profile::FromWebUI(web_ui); | 1022 Profile* profile = Profile::FromWebUI(web_ui); |
| 1019 content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile)); | 1023 content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile)); |
| 1020 } | 1024 } |
| 1021 | 1025 |
| 1022 // static | 1026 // static |
| 1023 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( | 1027 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( |
| 1024 ui::ScaleFactor scale_factor) { | 1028 ui::ScaleFactor scale_factor) { |
| 1025 return ResourceBundle::GetSharedInstance(). | 1029 return ResourceBundle::GetSharedInstance(). |
| 1026 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); | 1030 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); |
| 1027 } | 1031 } |
| OLD | NEW |