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

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

Issue 12218058: History: Use images instead of unicode characters. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/history/history.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 (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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 source->AddLocalizedString("actionMenuDescription", 136 source->AddLocalizedString("actionMenuDescription",
137 IDS_HISTORY_ACTION_MENU_DESCRIPTION); 137 IDS_HISTORY_ACTION_MENU_DESCRIPTION);
138 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE); 138 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
139 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); 139 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
140 source->AddLocalizedString("displayfiltersites", IDS_GROUP_BY_DOMAIN_LABEL); 140 source->AddLocalizedString("displayfiltersites", IDS_GROUP_BY_DOMAIN_LABEL);
141 source->AddLocalizedString("rangelabel", IDS_HISTORY_RANGE_LABEL); 141 source->AddLocalizedString("rangelabel", IDS_HISTORY_RANGE_LABEL);
142 source->AddLocalizedString("rangealltime", IDS_HISTORY_RANGE_ALL_TIME); 142 source->AddLocalizedString("rangealltime", IDS_HISTORY_RANGE_ALL_TIME);
143 source->AddLocalizedString("rangeweek", IDS_HISTORY_RANGE_WEEK); 143 source->AddLocalizedString("rangeweek", IDS_HISTORY_RANGE_WEEK);
144 source->AddLocalizedString("rangemonth", IDS_HISTORY_RANGE_MONTH); 144 source->AddLocalizedString("rangemonth", IDS_HISTORY_RANGE_MONTH);
145 source->AddLocalizedString("rangetoday", IDS_HISTORY_RANGE_TODAY); 145 source->AddLocalizedString("rangetoday", IDS_HISTORY_RANGE_TODAY);
146 source->AddLocalizedString("rangenext", IDS_HISTORY_RANGE_NEXT);
147 source->AddLocalizedString("rangeprevious", IDS_HISTORY_RANGE_PREVIOUS);
146 source->AddLocalizedString("numbervisits", IDS_HISTORY_NUMBER_VISITS); 148 source->AddLocalizedString("numbervisits", IDS_HISTORY_NUMBER_VISITS);
147 source->AddBoolean("groupByDomain", 149 source->AddBoolean("groupByDomain",
148 CommandLine::ForCurrentProcess()->HasSwitch( 150 CommandLine::ForCurrentProcess()->HasSwitch(
149 switches::kHistoryEnableGroupByDomain)); 151 switches::kHistoryEnableGroupByDomain));
150 source->SetJsonPath(kStringsJsFile); 152 source->SetJsonPath(kStringsJsFile);
151 source->AddResourcePath(kHistoryJsFile, IDR_HISTORY_JS); 153 source->AddResourcePath(kHistoryJsFile, IDR_HISTORY_JS);
152 source->SetDefaultResource(IDR_HISTORY_HTML); 154 source->SetDefaultResource(IDR_HISTORY_HTML);
153 source->SetUseJsonJSFormatV2(); 155 source->SetUseJsonJSFormatV2();
154 source->DisableDenyXFrameOptions(); 156 source->DisableDenyXFrameOptions();
155 157
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" + 712 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" +
711 net::EscapeQueryParamValue(UTF16ToUTF8(text), true)); 713 net::EscapeQueryParamValue(UTF16ToUTF8(text), true));
712 } 714 }
713 715
714 // static 716 // static
715 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( 717 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
716 ui::ScaleFactor scale_factor) { 718 ui::ScaleFactor scale_factor) {
717 return ResourceBundle::GetSharedInstance(). 719 return ResourceBundle::GetSharedInstance().
718 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); 720 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
719 } 721 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/history/history.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698