| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS); | 57 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS); |
| 58 source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS); | 58 source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS); |
| 59 source->AddLocalizedString("noSyncedResults", | 59 source->AddLocalizedString("noSyncedResults", |
| 60 IDS_MD_HISTORY_NO_SYNCED_RESULTS); | 60 IDS_MD_HISTORY_NO_SYNCED_RESULTS); |
| 61 source->AddLocalizedString("rangeAllTime", IDS_HISTORY_RANGE_ALL_TIME); | 61 source->AddLocalizedString("rangeAllTime", IDS_HISTORY_RANGE_ALL_TIME); |
| 62 source->AddLocalizedString("rangeWeek", IDS_HISTORY_RANGE_WEEK); | 62 source->AddLocalizedString("rangeWeek", IDS_HISTORY_RANGE_WEEK); |
| 63 source->AddLocalizedString("rangeMonth", IDS_HISTORY_RANGE_MONTH); | 63 source->AddLocalizedString("rangeMonth", IDS_HISTORY_RANGE_MONTH); |
| 64 source->AddLocalizedString("rangeToday", IDS_HISTORY_RANGE_TODAY); | 64 source->AddLocalizedString("rangeToday", IDS_HISTORY_RANGE_TODAY); |
| 65 source->AddLocalizedString("rangeNext", IDS_HISTORY_RANGE_NEXT); | 65 source->AddLocalizedString("rangeNext", IDS_HISTORY_RANGE_NEXT); |
| 66 source->AddLocalizedString("rangePrevious", IDS_HISTORY_RANGE_PREVIOUS); | 66 source->AddLocalizedString("rangePrevious", IDS_HISTORY_RANGE_PREVIOUS); |
| 67 source->AddLocalizedString("removeBookmark", IDS_HISTORY_REMOVE_BOOKMARK); |
| 67 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE); | 68 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE); |
| 68 source->AddLocalizedString("searchPrompt", IDS_MD_HISTORY_SEARCH_PROMPT); | 69 source->AddLocalizedString("searchPrompt", IDS_MD_HISTORY_SEARCH_PROMPT); |
| 69 source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT); | 70 source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT); |
| 70 source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS); | 71 source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS); |
| 71 source->AddLocalizedString("signInButton", IDS_MD_HISTORY_SIGN_IN_BUTTON); | 72 source->AddLocalizedString("signInButton", IDS_MD_HISTORY_SIGN_IN_BUTTON); |
| 72 source->AddLocalizedString("signInPromo", IDS_MD_HISTORY_SIGN_IN_PROMO); | 73 source->AddLocalizedString("signInPromo", IDS_MD_HISTORY_SIGN_IN_PROMO); |
| 73 source->AddLocalizedString("signInPromoDesc", | 74 source->AddLocalizedString("signInPromoDesc", |
| 74 IDS_MD_HISTORY_SIGN_IN_PROMO_DESC); | 75 IDS_MD_HISTORY_SIGN_IN_PROMO_DESC); |
| 75 source->AddLocalizedString("title", IDS_HISTORY_TITLE); | 76 source->AddLocalizedString("title", IDS_HISTORY_TITLE); |
| 76 | 77 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 base::FeatureList::ClearInstanceForTesting(); | 175 base::FeatureList::ClearInstanceForTesting(); |
| 175 base::FeatureList::SetInstance(std::move(feature_list)); | 176 base::FeatureList::SetInstance(std::move(feature_list)); |
| 176 } | 177 } |
| 177 | 178 |
| 178 // static | 179 // static |
| 179 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( | 180 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( |
| 180 ui::ScaleFactor scale_factor) { | 181 ui::ScaleFactor scale_factor) { |
| 181 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 182 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
| 182 IDR_HISTORY_FAVICON, scale_factor); | 183 IDR_HISTORY_FAVICON, scale_factor); |
| 183 } | 184 } |
| OLD | NEW |