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

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

Issue 2203683002: MD History: Convert synced device collapse icon to a button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « chrome/browser/resources/md_history/synced_device_card.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 26 matching lines...) Expand all
37 PrefService* prefs = profile->GetPrefs(); 37 PrefService* prefs = profile->GetPrefs();
38 38
39 content::WebUIDataSource* source = 39 content::WebUIDataSource* source =
40 content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost); 40 content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost);
41 41
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",
48 IDS_HISTORY_OTHER_SESSIONS_COLLAPSE_SESSION);
47 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE); 49 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE);
48 source->AddLocalizedString("deleteConfirm", 50 source->AddLocalizedString("deleteConfirm",
49 IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON); 51 IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON);
50 source->AddLocalizedString( 52 source->AddLocalizedString(
51 "deleteWarning", IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING_NO_INCOGNITO); 53 "deleteWarning", IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING_NO_INCOGNITO);
54 source->AddLocalizedString("expandSessionButton",
55 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION);
52 source->AddLocalizedString("foundSearchResults", 56 source->AddLocalizedString("foundSearchResults",
53 IDS_HISTORY_FOUND_SEARCH_RESULTS); 57 IDS_HISTORY_FOUND_SEARCH_RESULTS);
54 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); 58 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL);
55 source->AddLocalizedString("historyMenuItem", 59 source->AddLocalizedString("historyMenuItem",
56 IDS_MD_HISTORY_HISTORY_MENU_ITEM); 60 IDS_MD_HISTORY_HISTORY_MENU_ITEM);
57 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); 61 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED);
58 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); 62 source->AddLocalizedString("loading", IDS_HISTORY_LOADING);
59 source->AddLocalizedString("moreActionsButton", 63 source->AddLocalizedString("moreActionsButton",
60 IDS_HISTORY_ACTION_MENU_DESCRIPTION); 64 IDS_HISTORY_ACTION_MENU_DESCRIPTION);
61 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); 65 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 base::FeatureList::ClearInstanceForTesting(); 202 base::FeatureList::ClearInstanceForTesting();
199 base::FeatureList::SetInstance(std::move(feature_list)); 203 base::FeatureList::SetInstance(std::move(feature_list));
200 } 204 }
201 205
202 // static 206 // static
203 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( 207 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes(
204 ui::ScaleFactor scale_factor) { 208 ui::ScaleFactor scale_factor) {
205 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( 209 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
206 IDR_HISTORY_FAVICON, scale_factor); 210 IDR_HISTORY_FAVICON, scale_factor);
207 } 211 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/md_history/synced_device_card.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698