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

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

Issue 2069183002: [Sync] Add option to remove device from "Other devices" on desktop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix string order Created 4 years, 6 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/history_ui.h" 5 #include "chrome/browser/ui/webui/history_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/ref_counted_memory.h" 10 #include "base/memory/ref_counted_memory.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 signin_manager->IsAuthenticated(); 71 signin_manager->IsAuthenticated();
72 72
73 content::WebUIDataSource* source = 73 content::WebUIDataSource* source =
74 content::WebUIDataSource::Create(chrome::kChromeUIHistoryFrameHost); 74 content::WebUIDataSource::Create(chrome::kChromeUIHistoryFrameHost);
75 source->AddBoolean("isUserSignedIn", is_authenticated); 75 source->AddBoolean("isUserSignedIn", is_authenticated);
76 source->AddLocalizedString("collapseSessionMenuItemText", 76 source->AddLocalizedString("collapseSessionMenuItemText",
77 IDS_HISTORY_OTHER_SESSIONS_COLLAPSE_SESSION); 77 IDS_HISTORY_OTHER_SESSIONS_COLLAPSE_SESSION);
78 source->AddLocalizedString("expandSessionMenuItemText", 78 source->AddLocalizedString("expandSessionMenuItemText",
79 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION); 79 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION);
80 source->AddLocalizedString("restoreSessionMenuItemText", 80 source->AddLocalizedString("restoreSessionMenuItemText",
81 IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL); 81 IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL);
Dan Beam 2016/07/30 00:54:08 shouldn't this be done only on !android?
pavely 2016/08/01 19:25:13 Done.
82 source->AddLocalizedString("deleteSessionMenuItemText",
83 IDS_HISTORY_OTHER_SESSIONS_HIDE_FOR_NOW);
Dan Beam 2016/07/30 00:54:08 indent off
pavely 2016/08/01 19:25:13 Done.
82 source->AddLocalizedString("xMore", IDS_HISTORY_OTHER_DEVICES_X_MORE); 84 source->AddLocalizedString("xMore", IDS_HISTORY_OTHER_DEVICES_X_MORE);
83 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); 85 source->AddLocalizedString("loading", IDS_HISTORY_LOADING);
84 source->AddLocalizedString("title", IDS_HISTORY_TITLE); 86 source->AddLocalizedString("title", IDS_HISTORY_TITLE);
85 source->AddLocalizedString("newest", IDS_HISTORY_NEWEST); 87 source->AddLocalizedString("newest", IDS_HISTORY_NEWEST);
86 source->AddLocalizedString("newer", IDS_HISTORY_NEWER); 88 source->AddLocalizedString("newer", IDS_HISTORY_NEWER);
87 source->AddLocalizedString("older", IDS_HISTORY_OLDER); 89 source->AddLocalizedString("older", IDS_HISTORY_OLDER);
88 source->AddLocalizedString("searchResultsFor", IDS_HISTORY_SEARCHRESULTSFOR); 90 source->AddLocalizedString("searchResultsFor", IDS_HISTORY_SEARCHRESULTSFOR);
89 source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT); 91 source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT);
90 source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS); 92 source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS);
91 source->AddLocalizedString("foundSearchResults", 93 source->AddLocalizedString("foundSearchResults",
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 } 199 }
198 200
199 HistoryUI::~HistoryUI() {} 201 HistoryUI::~HistoryUI() {}
200 202
201 // static 203 // static
202 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( 204 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
203 ui::ScaleFactor scale_factor) { 205 ui::ScaleFactor scale_factor) {
204 return ResourceBundle::GetSharedInstance(). 206 return ResourceBundle::GetSharedInstance().
205 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); 207 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
206 } 208 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698