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

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: Address Dan's comments. 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/history/other_devices.js ('k') | components/history_strings.grdp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 // windows may not have a sign in manager, and are considered not 66 // windows may not have a sign in manager, and are considered not
67 // authenticated. 67 // authenticated.
68 SigninManagerBase* signin_manager = 68 SigninManagerBase* signin_manager =
69 SigninManagerFactory::GetForProfile(profile); 69 SigninManagerFactory::GetForProfile(profile);
70 bool is_authenticated = signin_manager != nullptr && 70 bool is_authenticated = signin_manager != nullptr &&
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 #if !defined(OS_ANDROID)
76 source->AddLocalizedString("collapseSessionMenuItemText", 77 source->AddLocalizedString("collapseSessionMenuItemText",
77 IDS_HISTORY_OTHER_SESSIONS_COLLAPSE_SESSION); 78 IDS_HISTORY_OTHER_SESSIONS_COLLAPSE_SESSION);
78 source->AddLocalizedString("expandSessionMenuItemText", 79 source->AddLocalizedString("expandSessionMenuItemText",
79 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION); 80 IDS_HISTORY_OTHER_SESSIONS_EXPAND_SESSION);
80 source->AddLocalizedString("restoreSessionMenuItemText", 81 source->AddLocalizedString("restoreSessionMenuItemText",
81 IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL); 82 IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL);
83 source->AddLocalizedString("deleteSessionMenuItemText",
84 IDS_HISTORY_OTHER_SESSIONS_HIDE_FOR_NOW);
85 #endif
82 source->AddLocalizedString("xMore", IDS_HISTORY_OTHER_DEVICES_X_MORE); 86 source->AddLocalizedString("xMore", IDS_HISTORY_OTHER_DEVICES_X_MORE);
83 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); 87 source->AddLocalizedString("loading", IDS_HISTORY_LOADING);
84 source->AddLocalizedString("title", IDS_HISTORY_TITLE); 88 source->AddLocalizedString("title", IDS_HISTORY_TITLE);
85 source->AddLocalizedString("newest", IDS_HISTORY_NEWEST); 89 source->AddLocalizedString("newest", IDS_HISTORY_NEWEST);
86 source->AddLocalizedString("newer", IDS_HISTORY_NEWER); 90 source->AddLocalizedString("newer", IDS_HISTORY_NEWER);
87 source->AddLocalizedString("older", IDS_HISTORY_OLDER); 91 source->AddLocalizedString("older", IDS_HISTORY_OLDER);
88 source->AddLocalizedString("searchResultsFor", IDS_HISTORY_SEARCHRESULTSFOR); 92 source->AddLocalizedString("searchResultsFor", IDS_HISTORY_SEARCHRESULTSFOR);
89 source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT); 93 source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT);
90 source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS); 94 source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS);
91 source->AddLocalizedString("foundSearchResults", 95 source->AddLocalizedString("foundSearchResults",
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 } 202 }
199 203
200 HistoryUI::~HistoryUI() {} 204 HistoryUI::~HistoryUI() {}
201 205
202 // static 206 // static
203 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( 207 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
204 ui::ScaleFactor scale_factor) { 208 ui::ScaleFactor scale_factor) {
205 return ResourceBundle::GetSharedInstance(). 209 return ResourceBundle::GetSharedInstance().
206 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); 210 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
207 } 211 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/history/other_devices.js ('k') | components/history_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698