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 1aeb6be92a572f830454a4e8547bc4aca9f94fb0..02d9043becd3c51763e87ecdd7706abfeaa1075a 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"
@@ -117,7 +119,9 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource() {
   source->AddLocalizedString("history", IDS_HISTORY_BROWSERESULTS);
   source->AddLocalizedString("cont", IDS_HISTORY_CONTINUED);
   source->AddLocalizedString("searchbutton", IDS_HISTORY_SEARCH_BUTTON);
-  source->AddLocalizedString("noresults", IDS_HISTORY_NO_RESULTS);
+  source->AddLocalizedString("nosearchresults", IDS_HISTORY_NO_SEARCH_RESULTS);
+  source->AddLocalizedString("noresults",
+                             IDS_HISTORY_NO_RESULTS);

[Patrick Dubroy, 2013/01/21 14:35:44]

Don't need to wrap this line.

[Sergiu, 2013/01/21 18:19:50]

Done.

   source->AddLocalizedString("noitems", IDS_HISTORY_NO_ITEMS);
   source->AddLocalizedString("edithistory", IDS_HISTORY_START_EDITING_HISTORY);
   source->AddLocalizedString("doneediting", IDS_HISTORY_STOP_EDITING_HISTORY);
@@ -137,6 +141,13 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource() {
   source->AddResourcePath(kHistoryJsFile, IDR_HISTORY_JS);
   source->SetDefaultResource(IDR_HISTORY_HTML);
   source->SetUseJsonJSFormatV2();
+  source->AddLocalizedString("displayfiltersites",
+                             IDS_GROUP_BY_DOMAIN_LABEL);

[Patrick Dubroy, 2013/01/21 14:35:44]

Also doesn't need to be wrapped.

[Sergiu, 2013/01/21 18:19:50]

Done.

+  source->AddLocalizedString("numbervisits", IDS_HISTORY_NUMBER_VISITS);
+  source->AddBoolean("historyGroupEnabled",

[Patrick Dubroy, 2013/01/21 14:35:44]

Can you name this "groupByDomain"?

[Sergiu, 2013/01/21 18:19:50]

Done.

+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kHistoryEnableGroupByDomain));
+
   return source;
 }