| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 IDS_CLEAR_BROWSING_DATA_TITLE); | 43 IDS_CLEAR_BROWSING_DATA_TITLE); |
| 44 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH); | 44 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH); |
| 45 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE); | 45 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE); |
| 46 source->AddLocalizedString("foundSearchResults", | 46 source->AddLocalizedString("foundSearchResults", |
| 47 IDS_HISTORY_FOUND_SEARCH_RESULTS); | 47 IDS_HISTORY_FOUND_SEARCH_RESULTS); |
| 48 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); | 48 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); |
| 49 source->AddLocalizedString("historyMenuItem", | 49 source->AddLocalizedString("historyMenuItem", |
| 50 IDS_MD_HISTORY_HISTORY_MENU_ITEM); | 50 IDS_MD_HISTORY_HISTORY_MENU_ITEM); |
| 51 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); | 51 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); |
| 52 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); | 52 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); |
| 53 source->AddLocalizedString("moreActionsButton", |
| 54 IDS_HISTORY_ACTION_MENU_DESCRIPTION); |
| 53 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); | 55 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); |
| 54 source->AddLocalizedString("openAll", IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL); | 56 source->AddLocalizedString("openAll", IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL); |
| 55 source->AddLocalizedString("openTabsMenuItem", | 57 source->AddLocalizedString("openTabsMenuItem", |
| 56 IDS_MD_HISTORY_OPEN_TABS_MENU_ITEM); | 58 IDS_MD_HISTORY_OPEN_TABS_MENU_ITEM); |
| 57 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS); | 59 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS); |
| 58 source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS); | 60 source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS); |
| 59 source->AddLocalizedString("noSyncedResults", | 61 source->AddLocalizedString("noSyncedResults", |
| 60 IDS_MD_HISTORY_NO_SYNCED_RESULTS); | 62 IDS_MD_HISTORY_NO_SYNCED_RESULTS); |
| 61 source->AddLocalizedString("rangeAllTime", IDS_HISTORY_RANGE_ALL_TIME); | 63 source->AddLocalizedString("rangeAllTime", IDS_HISTORY_RANGE_ALL_TIME); |
| 62 source->AddLocalizedString("rangeWeek", IDS_HISTORY_RANGE_WEEK); | 64 source->AddLocalizedString("rangeWeek", IDS_HISTORY_RANGE_WEEK); |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 base::FeatureList::ClearInstanceForTesting(); | 176 base::FeatureList::ClearInstanceForTesting(); |
| 175 base::FeatureList::SetInstance(std::move(feature_list)); | 177 base::FeatureList::SetInstance(std::move(feature_list)); |
| 176 } | 178 } |
| 177 | 179 |
| 178 // static | 180 // static |
| 179 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( | 181 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( |
| 180 ui::ScaleFactor scale_factor) { | 182 ui::ScaleFactor scale_factor) { |
| 181 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 183 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
| 182 IDR_HISTORY_FAVICON, scale_factor); | 184 IDR_HISTORY_FAVICON, scale_factor); |
| 183 } | 185 } |
| OLD | NEW |