| 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("expandSessionButton", | 56 source->AddLocalizedString("expandSessionButton", |
| 57 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION); | 57 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION); |
| 58 source->AddLocalizedString("foundSearchResults", | 58 source->AddLocalizedString("foundSearchResults", |
| 59 IDS_HISTORY_FOUND_SEARCH_RESULTS); | 59 IDS_HISTORY_FOUND_SEARCH_RESULTS); |
| 60 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); | 60 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); |
| 61 source->AddLocalizedString("historyMenuButton", |
| 62 IDS_MD_HISTORY_HISTORY_MENU_DESCRIPTION); |
| 61 source->AddLocalizedString("historyMenuItem", | 63 source->AddLocalizedString("historyMenuItem", |
| 62 IDS_MD_HISTORY_HISTORY_MENU_ITEM); | 64 IDS_MD_HISTORY_HISTORY_MENU_ITEM); |
| 63 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); | 65 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); |
| 64 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); | 66 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); |
| 65 source->AddLocalizedString("moreActionsButton", | 67 source->AddLocalizedString("moreActionsButton", |
| 66 IDS_HISTORY_ACTION_MENU_DESCRIPTION); | 68 IDS_HISTORY_ACTION_MENU_DESCRIPTION); |
| 67 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); | 69 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); |
| 68 source->AddLocalizedString("openAll", IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL); | 70 source->AddLocalizedString("openAll", IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL); |
| 69 source->AddLocalizedString("openTabsMenuItem", | 71 source->AddLocalizedString("openTabsMenuItem", |
| 70 IDS_MD_HISTORY_OPEN_TABS_MENU_ITEM); | 72 IDS_MD_HISTORY_OPEN_TABS_MENU_ITEM); |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 base::FeatureList::ClearInstanceForTesting(); | 209 base::FeatureList::ClearInstanceForTesting(); |
| 208 base::FeatureList::SetInstance(std::move(feature_list)); | 210 base::FeatureList::SetInstance(std::move(feature_list)); |
| 209 } | 211 } |
| 210 | 212 |
| 211 // static | 213 // static |
| 212 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( | 214 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( |
| 213 ui::ScaleFactor scale_factor) { | 215 ui::ScaleFactor scale_factor) { |
| 214 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 216 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
| 215 IDR_HISTORY_FAVICON, scale_factor); | 217 IDR_HISTORY_FAVICON, scale_factor); |
| 216 } | 218 } |
| OLD | NEW |