History: Add option to group visits by domain

chrome/browser/ui/webui/history_ui.cc

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);

[Patrick Dubroy, 2013/01/18 11:43:27]

Looks unrelated to group by domain.

[Sergiu, 2013/01/21 08:56:16]

It is, this is the "No results were found in this interval" message. if there
are no results for a certain interval. This works for normal results as well,
but I'm not sure if it would need its own CL or not.

   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);

[Patrick Dubroy, 2013/01/18 11:43:27]

Looks like it's also unrelated.

[Sergiu, 2013/01/21 08:56:16]

It is related, renamed to be more descriptive.

+  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;

[Patrick Dubroy, 2013/01/18 11:43:27]

Why can't you just add the string by itself? Why do you need to create the
dictionaryvalue?

[Sergiu, 2013/01/21 08:56:16]

Well, the thing is that |source| only had AddString but not AddBoolean, and I'm
not exactly sure how the dictionary way works (it merges the dictionaries while
keeping Booleans as they are). Anyway, I used strings in the end.

[Bernhard Bauer, 2013/01/21 09:10:03]

The problem is that AddLocalizedString takes a resource ID and looks up the
corresponding string itself, but we want to pass in a boolean. The dictionary
merge does nothing special for booleans or strings, it just merges the
dictionary containing the boolean into the the one containing strings.
And why exactly did you do that? The idiomatic way in WebUI is to use booleans.
It also seems more natural to me to encode a two-state value with a boolean
instead of a string.

[Sergiu, 2013/01/21 09:29:11]

Well this is odd.. Initially when I looked at that I didn't see
ChromeWebUIDataSource's AddBoolean method, although I looked twice :(
Fixed it now, sorry about that.

+  localized_strings.SetBoolean("historyGroupEnabled",
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kHistoryEnableGrouped));
+  source->AddLocalizedStrings(localized_strings);
+
   return source;
 }