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

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

Issue 1965913003: [MD History] Add grouped history toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cbd_move
Patch Set: address comments Created 4 years, 7 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
« no previous file with comments | « chrome/browser/resources/md_history/history_toolbar.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/md_history_ui.h" 5 #include "chrome/browser/ui/webui/md_history_ui.h"
6 6
7 #include "base/command_line.h"
7 #include "build/build_config.h" 8 #include "build/build_config.h"
8 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/webui/browsing_history_handler.h" 10 #include "chrome/browser/ui/webui/browsing_history_handler.h"
10 #include "chrome/browser/ui/webui/foreign_session_handler.h" 11 #include "chrome/browser/ui/webui/foreign_session_handler.h"
11 #include "chrome/browser/ui/webui/history_login_handler.h" 12 #include "chrome/browser/ui/webui/history_login_handler.h"
12 #include "chrome/browser/ui/webui/metrics_handler.h" 13 #include "chrome/browser/ui/webui/metrics_handler.h"
14 #include "chrome/common/chrome_switches.h"
13 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
14 #include "chrome/common/url_constants.h" 16 #include "chrome/common/url_constants.h"
15 #include "components/prefs/pref_service.h" 17 #include "components/prefs/pref_service.h"
16 #include "components/search/search.h" 18 #include "components/search/search.h"
17 #include "content/public/browser/web_ui.h" 19 #include "content/public/browser/web_ui.h"
18 #include "content/public/browser/web_ui_data_source.h" 20 #include "content/public/browser/web_ui_data_source.h"
19 #include "grit/browser_resources.h" 21 #include "grit/browser_resources.h"
20 #include "grit/components_scaled_resources.h" 22 #include "grit/components_scaled_resources.h"
21 #include "grit/components_strings.h" 23 #include "grit/components_strings.h"
22 #include "grit/generated_resources.h" 24 #include "grit/generated_resources.h"
23 #include "grit/theme_resources.h" 25 #include "grit/theme_resources.h"
24 #include "ui/base/resource/resource_bundle.h" 26 #include "ui/base/resource/resource_bundle.h"
25 27
26 namespace { 28 namespace {
27 29
28 content::WebUIDataSource* CreateMdHistoryUIHTMLSource(Profile* profile) { 30 content::WebUIDataSource* CreateMdHistoryUIHTMLSource(Profile* profile) {
29 PrefService* prefs = profile->GetPrefs(); 31 PrefService* prefs = profile->GetPrefs();
30 32
31 content::WebUIDataSource* source = 33 content::WebUIDataSource* source =
32 content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost); 34 content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost);
33 35
34 // Localized strings (alphabetical order). 36 // Localized strings (alphabetical order).
35 source->AddLocalizedString("cancel", IDS_CANCEL); 37 source->AddLocalizedString("cancel", IDS_CANCEL);
36 source->AddLocalizedString("clearBrowsingData", 38 source->AddLocalizedString("clearBrowsingData",
37 IDS_CLEAR_BROWSING_DATA_TITLE); 39 IDS_CLEAR_BROWSING_DATA_TITLE);
38 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH); 40 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH);
39 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE); 41 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE);
40 source->AddLocalizedString("foundSearchResults", 42 source->AddLocalizedString("foundSearchResults",
41 IDS_HISTORY_FOUND_SEARCH_RESULTS); 43 IDS_HISTORY_FOUND_SEARCH_RESULTS);
44 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL);
42 source->AddLocalizedString("historyMenuItem", 45 source->AddLocalizedString("historyMenuItem",
43 IDS_MD_HISTORY_HISTORY_MENU_ITEM); 46 IDS_MD_HISTORY_HISTORY_MENU_ITEM);
44 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); 47 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED);
45 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); 48 source->AddLocalizedString("loading", IDS_HISTORY_LOADING);
46 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); 49 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
47 source->AddLocalizedString("openAll", IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL); 50 source->AddLocalizedString("openAll", IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL);
48 source->AddLocalizedString("openTabsMenuItem", 51 source->AddLocalizedString("openTabsMenuItem",
49 IDS_MD_HISTORY_OPEN_TABS_MENU_ITEM); 52 IDS_MD_HISTORY_OPEN_TABS_MENU_ITEM);
50 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS); 53 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS);
51 source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS); 54 source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS);
55 source->AddLocalizedString("rangeAllTime", IDS_HISTORY_RANGE_ALL_TIME);
56 source->AddLocalizedString("rangeWeek", IDS_HISTORY_RANGE_WEEK);
57 source->AddLocalizedString("rangeMonth", IDS_HISTORY_RANGE_MONTH);
58 source->AddLocalizedString("rangeToday", IDS_HISTORY_RANGE_TODAY);
59 source->AddLocalizedString("rangeNext", IDS_HISTORY_RANGE_NEXT);
60 source->AddLocalizedString("rangePrevious", IDS_HISTORY_RANGE_PREVIOUS);
52 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE); 61 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
53 source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH); 62 source->AddLocalizedString("search", IDS_MD_HISTORY_SEARCH);
54 source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT); 63 source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT);
55 source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS); 64 source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS);
56 source->AddLocalizedString("title", IDS_HISTORY_TITLE); 65 source->AddLocalizedString("title", IDS_HISTORY_TITLE);
57 66
58 bool allow_deleting_history = 67 bool allow_deleting_history =
59 prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory); 68 prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory);
60 source->AddBoolean("allowDeletingHistory", allow_deleting_history); 69 source->AddBoolean("allowDeletingHistory", allow_deleting_history);
70
71 bool group_by_domain = base::CommandLine::ForCurrentProcess()->HasSwitch(
72 switches::kHistoryEnableGroupByDomain);
73 source->AddBoolean("groupByDomain", group_by_domain);
74
61 source->AddResourcePath("app.html", IDR_MD_HISTORY_APP_HTML); 75 source->AddResourcePath("app.html", IDR_MD_HISTORY_APP_HTML);
62 source->AddResourcePath("app.js", IDR_MD_HISTORY_APP_JS); 76 source->AddResourcePath("app.js", IDR_MD_HISTORY_APP_JS);
63 source->AddResourcePath("constants.html", IDR_MD_HISTORY_CONSTANTS_HTML); 77 source->AddResourcePath("constants.html", IDR_MD_HISTORY_CONSTANTS_HTML);
64 source->AddResourcePath("constants.js", IDR_MD_HISTORY_CONSTANTS_JS); 78 source->AddResourcePath("constants.js", IDR_MD_HISTORY_CONSTANTS_JS);
65 source->AddResourcePath("history_item.html", 79 source->AddResourcePath("history_item.html",
66 IDR_MD_HISTORY_HISTORY_ITEM_HTML); 80 IDR_MD_HISTORY_HISTORY_ITEM_HTML);
67 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS); 81 source->AddResourcePath("history_item.js", IDR_MD_HISTORY_HISTORY_ITEM_JS);
68 source->AddResourcePath("history_list.html", 82 source->AddResourcePath("history_list.html",
69 IDR_MD_HISTORY_HISTORY_LIST_HTML); 83 IDR_MD_HISTORY_HISTORY_LIST_HTML);
70 source->AddResourcePath("history_list.js", IDR_MD_HISTORY_HISTORY_LIST_JS); 84 source->AddResourcePath("history_list.js", IDR_MD_HISTORY_HISTORY_LIST_JS);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 content::WebUIDataSource::Add(profile, CreateMdHistoryUIHTMLSource(profile)); 121 content::WebUIDataSource::Add(profile, CreateMdHistoryUIHTMLSource(profile));
108 } 122 }
109 123
110 MdHistoryUI::~MdHistoryUI() {} 124 MdHistoryUI::~MdHistoryUI() {}
111 125
112 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( 126 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes(
113 ui::ScaleFactor scale_factor) { 127 ui::ScaleFactor scale_factor) {
114 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( 128 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
115 IDR_HISTORY_FAVICON, scale_factor); 129 IDR_HISTORY_FAVICON, scale_factor);
116 } 130 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/md_history/history_toolbar.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698