Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Side by Side Diff: chrome/browser/ui/webui/md_history_ui.cc

Issue 2204833003: MD History: Add menu to cards on Synced Tabs page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@history_improve_collapse_button
Patch Set: Fix tests Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // Localized strings (alphabetical order). 42 // Localized strings (alphabetical order).
43 source->AddLocalizedString("cancel", IDS_CANCEL); 43 source->AddLocalizedString("cancel", IDS_CANCEL);
44 source->AddLocalizedString("clearBrowsingData", 44 source->AddLocalizedString("clearBrowsingData",
45 IDS_CLEAR_BROWSING_DATA_TITLE); 45 IDS_CLEAR_BROWSING_DATA_TITLE);
46 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH); 46 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH);
47 source->AddLocalizedString("collapseSessionButton", 47 source->AddLocalizedString("collapseSessionButton",
48 IDS_HISTORY_OTHER_SESSIONS_COLLAPSE_SESSION); 48 IDS_HISTORY_OTHER_SESSIONS_COLLAPSE_SESSION);
49 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE); 49 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE);
50 source->AddLocalizedString("deleteConfirm", 50 source->AddLocalizedString("deleteConfirm",
51 IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON); 51 IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON);
52 source->AddLocalizedString("deleteSession",
53 IDS_HISTORY_OTHER_SESSIONS_HIDE_FOR_NOW);
52 source->AddLocalizedString( 54 source->AddLocalizedString(
53 "deleteWarning", IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING_NO_INCOGNITO); 55 "deleteWarning", IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING_NO_INCOGNITO);
54 source->AddLocalizedString("expandSessionButton", 56 source->AddLocalizedString("expandSessionButton",
55 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION); 57 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION);
56 source->AddLocalizedString("foundSearchResults", 58 source->AddLocalizedString("foundSearchResults",
57 IDS_HISTORY_FOUND_SEARCH_RESULTS); 59 IDS_HISTORY_FOUND_SEARCH_RESULTS);
58 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); 60 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL);
59 source->AddLocalizedString("historyMenuItem", 61 source->AddLocalizedString("historyMenuItem",
60 IDS_MD_HISTORY_HISTORY_MENU_ITEM); 62 IDS_MD_HISTORY_HISTORY_MENU_ITEM);
61 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); 63 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED);
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 base::FeatureList::ClearInstanceForTesting(); 203 base::FeatureList::ClearInstanceForTesting();
202 base::FeatureList::SetInstance(std::move(feature_list)); 204 base::FeatureList::SetInstance(std::move(feature_list));
203 } 205 }
204 206
205 // static 207 // static
206 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( 208 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes(
207 ui::ScaleFactor scale_factor) { 209 ui::ScaleFactor scale_factor) {
208 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( 210 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
209 IDR_HISTORY_FAVICON, scale_factor); 211 IDR_HISTORY_FAVICON, scale_factor);
210 } 212 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698