OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/md_history_ui.h" | 5 #include "chrome/browser/ui/webui/md_history_ui.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/signin/signin_manager_factory.h" | 10 #include "chrome/browser/signin/signin_manager_factory.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON); | 51 IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON); |
52 source->AddLocalizedString("deleteSession", | 52 source->AddLocalizedString("deleteSession", |
53 IDS_HISTORY_OTHER_SESSIONS_HIDE_FOR_NOW); | 53 IDS_HISTORY_OTHER_SESSIONS_HIDE_FOR_NOW); |
54 source->AddLocalizedString( | 54 source->AddLocalizedString( |
55 "deleteWarning", IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING_NO_INCOGNITO); | 55 "deleteWarning", IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING_NO_INCOGNITO); |
56 source->AddLocalizedString("entrySummary", IDS_HISTORY_ENTRY_SUMMARY); | 56 source->AddLocalizedString("entrySummary", IDS_HISTORY_ENTRY_SUMMARY); |
57 source->AddLocalizedString("expandSessionButton", | 57 source->AddLocalizedString("expandSessionButton", |
58 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION); | 58 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION); |
59 source->AddLocalizedString("foundSearchResults", | 59 source->AddLocalizedString("foundSearchResults", |
60 IDS_HISTORY_FOUND_SEARCH_RESULTS); | 60 IDS_HISTORY_FOUND_SEARCH_RESULTS); |
| 61 source->AddLocalizedString("hasSyncedResults", |
| 62 IDS_MD_HISTORY_HAS_SYNCED_RESULTS); |
| 63 source->AddLocalizedString("hasSyncedResultsDescription", |
| 64 IDS_MD_HISTORY_HAS_SYNCED_RESULTS_DESCRIPTION); |
61 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); | 65 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); |
62 source->AddLocalizedString("historyMenuButton", | 66 source->AddLocalizedString("historyMenuButton", |
63 IDS_MD_HISTORY_HISTORY_MENU_DESCRIPTION); | 67 IDS_MD_HISTORY_HISTORY_MENU_DESCRIPTION); |
64 source->AddLocalizedString("historyMenuItem", | 68 source->AddLocalizedString("historyMenuItem", |
65 IDS_MD_HISTORY_HISTORY_MENU_ITEM); | 69 IDS_MD_HISTORY_HISTORY_MENU_ITEM); |
66 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); | 70 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); |
67 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); | 71 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); |
68 source->AddLocalizedString("moreActionsButton", | 72 source->AddLocalizedString("moreActionsButton", |
69 IDS_HISTORY_ACTION_MENU_DESCRIPTION); | 73 IDS_HISTORY_ACTION_MENU_DESCRIPTION); |
70 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); | 74 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 base::FeatureList::ClearInstanceForTesting(); | 228 base::FeatureList::ClearInstanceForTesting(); |
225 base::FeatureList::SetInstance(std::move(feature_list)); | 229 base::FeatureList::SetInstance(std::move(feature_list)); |
226 } | 230 } |
227 | 231 |
228 // static | 232 // static |
229 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( | 233 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( |
230 ui::ScaleFactor scale_factor) { | 234 ui::ScaleFactor scale_factor) { |
231 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 235 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
232 IDR_HISTORY_FAVICON, scale_factor); | 236 IDR_HISTORY_FAVICON, scale_factor); |
233 } | 237 } |
OLD | NEW |