| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON); | 50 IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON); |
| 51 source->AddLocalizedString("deleteSession", | 51 source->AddLocalizedString("deleteSession", |
| 52 IDS_HISTORY_OTHER_SESSIONS_HIDE_FOR_NOW); | 52 IDS_HISTORY_OTHER_SESSIONS_HIDE_FOR_NOW); |
| 53 source->AddLocalizedString( | 53 source->AddLocalizedString( |
| 54 "deleteWarning", IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING_NO_INCOGNITO); | 54 "deleteWarning", IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING_NO_INCOGNITO); |
| 55 source->AddLocalizedString("expandSessionButton", | 55 source->AddLocalizedString("expandSessionButton", |
| 56 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION); | 56 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION); |
| 57 source->AddLocalizedString("foundSearchResults", | 57 source->AddLocalizedString("foundSearchResults", |
| 58 IDS_HISTORY_FOUND_SEARCH_RESULTS); | 58 IDS_HISTORY_FOUND_SEARCH_RESULTS); |
| 59 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); | 59 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); |
| 60 source->AddLocalizedString("historyMenuButton", |
| 61 IDS_MD_HISTORY_HISTORY_MENU_DESCRIPTION); |
| 60 source->AddLocalizedString("historyMenuItem", | 62 source->AddLocalizedString("historyMenuItem", |
| 61 IDS_MD_HISTORY_HISTORY_MENU_ITEM); | 63 IDS_MD_HISTORY_HISTORY_MENU_ITEM); |
| 62 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); | 64 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); |
| 63 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); | 65 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); |
| 64 source->AddLocalizedString("moreActionsButton", | 66 source->AddLocalizedString("moreActionsButton", |
| 65 IDS_HISTORY_ACTION_MENU_DESCRIPTION); | 67 IDS_HISTORY_ACTION_MENU_DESCRIPTION); |
| 66 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); | 68 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); |
| 67 source->AddLocalizedString("openAll", IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL); | 69 source->AddLocalizedString("openAll", IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL); |
| 68 source->AddLocalizedString("openTabsMenuItem", | 70 source->AddLocalizedString("openTabsMenuItem", |
| 69 IDS_MD_HISTORY_OPEN_TABS_MENU_ITEM); | 71 IDS_MD_HISTORY_OPEN_TABS_MENU_ITEM); |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 base::FeatureList::ClearInstanceForTesting(); | 218 base::FeatureList::ClearInstanceForTesting(); |
| 217 base::FeatureList::SetInstance(std::move(feature_list)); | 219 base::FeatureList::SetInstance(std::move(feature_list)); |
| 218 } | 220 } |
| 219 | 221 |
| 220 // static | 222 // static |
| 221 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( | 223 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( |
| 222 ui::ScaleFactor scale_factor) { | 224 ui::ScaleFactor scale_factor) { |
| 223 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 225 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
| 224 IDR_HISTORY_FAVICON, scale_factor); | 226 IDR_HISTORY_FAVICON, scale_factor); |
| 225 } | 227 } |
| OLD | NEW |