OLD | NEW |
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 <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 source->AddLocalizedString("lockButton", IDS_HISTORY_LOCK_BUTTON); | 166 source->AddLocalizedString("lockButton", IDS_HISTORY_LOCK_BUTTON); |
167 source->AddLocalizedString("blockedVisitText", | 167 source->AddLocalizedString("blockedVisitText", |
168 IDS_HISTORY_BLOCKED_VISIT_TEXT); | 168 IDS_HISTORY_BLOCKED_VISIT_TEXT); |
169 source->AddLocalizedString("unlockButton", IDS_HISTORY_UNLOCK_BUTTON); | 169 source->AddLocalizedString("unlockButton", IDS_HISTORY_UNLOCK_BUTTON); |
170 source->AddLocalizedString("hasSyncedResults", | 170 source->AddLocalizedString("hasSyncedResults", |
171 IDS_HISTORY_HAS_SYNCED_RESULTS); | 171 IDS_HISTORY_HAS_SYNCED_RESULTS); |
172 source->AddLocalizedString("noSyncedResults", IDS_HISTORY_NO_SYNCED_RESULTS); | 172 source->AddLocalizedString("noSyncedResults", IDS_HISTORY_NO_SYNCED_RESULTS); |
173 source->AddLocalizedString("cancel", IDS_CANCEL); | 173 source->AddLocalizedString("cancel", IDS_CANCEL); |
174 source->AddLocalizedString("deleteConfirm", | 174 source->AddLocalizedString("deleteConfirm", |
175 IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON); | 175 IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON); |
| 176 source->AddLocalizedString("bookmarked", IDS_HISTORY_ENTRY_BOOKMARKED); |
| 177 source->AddLocalizedString("entrySummary", IDS_HISTORY_ENTRY_SUMMARY); |
176 source->AddBoolean("isFullHistorySyncEnabled", | 178 source->AddBoolean("isFullHistorySyncEnabled", |
177 WebHistoryServiceFactory::GetForProfile(profile) != NULL); | 179 WebHistoryServiceFactory::GetForProfile(profile) != NULL); |
178 source->AddBoolean("groupByDomain", | 180 source->AddBoolean("groupByDomain", |
179 CommandLine::ForCurrentProcess()->HasSwitch( | 181 CommandLine::ForCurrentProcess()->HasSwitch( |
180 switches::kHistoryEnableGroupByDomain)); | 182 switches::kHistoryEnableGroupByDomain)); |
181 source->AddBoolean("allowDeletingHistory", | 183 source->AddBoolean("allowDeletingHistory", |
182 prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory)); | 184 prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory)); |
183 source->AddBoolean("isInstantExtendedApiEnabled", | 185 source->AddBoolean("isInstantExtendedApiEnabled", |
184 chrome::IsInstantExtendedAPIEnabled()); | 186 chrome::IsInstantExtendedAPIEnabled()); |
185 | 187 |
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1016 Profile* profile = Profile::FromWebUI(web_ui); | 1018 Profile* profile = Profile::FromWebUI(web_ui); |
1017 content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile)); | 1019 content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile)); |
1018 } | 1020 } |
1019 | 1021 |
1020 // static | 1022 // static |
1021 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( | 1023 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( |
1022 ui::ScaleFactor scale_factor) { | 1024 ui::ScaleFactor scale_factor) { |
1023 return ResourceBundle::GetSharedInstance(). | 1025 return ResourceBundle::GetSharedInstance(). |
1024 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); | 1026 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); |
1025 } | 1027 } |
OLD | NEW |