| Index: chrome/browser/ui/webui/history_ui.cc
|
| diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc
|
| index 78b89cf12f50a540022f1f2cb6d912463aafa714..53f0270b8aeac66ce31b7684d2a985089bed7ab0 100644
|
| --- a/chrome/browser/ui/webui/history_ui.cc
|
| +++ b/chrome/browser/ui/webui/history_ui.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| +#include "base/command_line.h"
|
| #include "base/i18n/rtl.h"
|
| #include "base/i18n/time_formatting.h"
|
| #include "base/memory/singleton.h"
|
| @@ -35,6 +36,7 @@
|
| #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
|
| #include "chrome/browser/ui/webui/favicon_source.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| +#include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/time_format.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "content/public/browser/notification_details.h"
|
| @@ -118,6 +120,8 @@ ChromeWebUIDataSource* CreateHistoryUIHTMLSource() {
|
| source->AddLocalizedString("cont", IDS_HISTORY_CONTINUED);
|
| source->AddLocalizedString("searchbutton", IDS_HISTORY_SEARCH_BUTTON);
|
| source->AddLocalizedString("noresults", IDS_HISTORY_NO_RESULTS);
|
| + source->AddLocalizedString("noresultsinterval",
|
| + IDS_HISTORY_NO_RESULTS_INTERVAL);
|
| source->AddLocalizedString("noitems", IDS_HISTORY_NO_ITEMS);
|
| source->AddLocalizedString("edithistory", IDS_HISTORY_START_EDITING_HISTORY);
|
| source->AddLocalizedString("doneediting", IDS_HISTORY_STOP_EDITING_HISTORY);
|
| @@ -133,10 +137,19 @@ ChromeWebUIDataSource* CreateHistoryUIHTMLSource() {
|
| IDS_HISTORY_ACTION_MENU_DESCRIPTION);
|
| source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
|
| source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
|
| + source->AddLocalizedString("displayfiltersites",
|
| + IDS_HISTORY_DISPLAY_FILTER_SITES);
|
| + source->AddLocalizedString("numbervisits", IDS_HISTORY_NUMBER_VISITS);
|
| source->set_json_path(kStringsJsFile);
|
| source->add_resource_path(kHistoryJsFile, IDR_HISTORY_JS);
|
| source->set_default_resource(IDR_HISTORY_HTML);
|
| source->set_use_json_js_format_v2();
|
| + DictionaryValue localized_strings;
|
| + localized_strings.SetBoolean("historyGroupEnabled",
|
| + CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kHistoryEnableGrouped));
|
| + source->AddLocalizedStrings(localized_strings);
|
| +
|
| return source;
|
| }
|
|
|
|
|