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

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

Issue 2077483002: MD History: Add confirmation dialog when deleting items from the toolbar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cr_refactor_dialog
Patch Set: Address nits Created 4 years, 5 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
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 "base/command_line.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/signin/signin_manager_factory.h" 10 #include "chrome/browser/signin/signin_manager_factory.h"
11 #include "chrome/browser/ui/webui/browsing_history_handler.h" 11 #include "chrome/browser/ui/webui/browsing_history_handler.h"
12 #include "chrome/browser/ui/webui/foreign_session_handler.h" 12 #include "chrome/browser/ui/webui/foreign_session_handler.h"
13 #include "chrome/browser/ui/webui/history_login_handler.h" 13 #include "chrome/browser/ui/webui/history_login_handler.h"
14 #include "chrome/browser/ui/webui/history_ui.h"
14 #include "chrome/browser/ui/webui/metrics_handler.h" 15 #include "chrome/browser/ui/webui/metrics_handler.h"
15 #include "chrome/browser/ui/webui/settings/people_handler.h" 16 #include "chrome/browser/ui/webui/settings/people_handler.h"
16 #include "chrome/common/chrome_features.h" 17 #include "chrome/common/chrome_features.h"
17 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
19 #include "chrome/common/url_constants.h" 20 #include "chrome/common/url_constants.h"
20 #include "components/prefs/pref_service.h" 21 #include "components/prefs/pref_service.h"
21 #include "components/search/search.h" 22 #include "components/search/search.h"
22 #include "components/signin/core/browser/signin_manager.h" 23 #include "components/signin/core/browser/signin_manager.h"
23 #include "content/public/browser/web_ui.h" 24 #include "content/public/browser/web_ui.h"
(...skipping 12 matching lines...) Expand all
36 37
37 content::WebUIDataSource* source = 38 content::WebUIDataSource* source =
38 content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost); 39 content::WebUIDataSource::Create(chrome::kChromeUIHistoryHost);
39 40
40 // Localized strings (alphabetical order). 41 // Localized strings (alphabetical order).
41 source->AddLocalizedString("cancel", IDS_CANCEL); 42 source->AddLocalizedString("cancel", IDS_CANCEL);
42 source->AddLocalizedString("clearBrowsingData", 43 source->AddLocalizedString("clearBrowsingData",
43 IDS_CLEAR_BROWSING_DATA_TITLE); 44 IDS_CLEAR_BROWSING_DATA_TITLE);
44 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH); 45 source->AddLocalizedString("clearSearch", IDS_MD_HISTORY_CLEAR_SEARCH);
45 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE); 46 source->AddLocalizedString("delete", IDS_MD_HISTORY_DELETE);
47 source->AddLocalizedString("deleteConfirm",
48 IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON);
46 source->AddLocalizedString("foundSearchResults", 49 source->AddLocalizedString("foundSearchResults",
47 IDS_HISTORY_FOUND_SEARCH_RESULTS); 50 IDS_HISTORY_FOUND_SEARCH_RESULTS);
48 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL); 51 source->AddLocalizedString("historyInterval", IDS_HISTORY_INTERVAL);
49 source->AddLocalizedString("historyMenuItem", 52 source->AddLocalizedString("historyMenuItem",
50 IDS_MD_HISTORY_HISTORY_MENU_ITEM); 53 IDS_MD_HISTORY_HISTORY_MENU_ITEM);
51 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED); 54 source->AddLocalizedString("itemsSelected", IDS_MD_HISTORY_ITEMS_SELECTED);
52 source->AddLocalizedString("loading", IDS_HISTORY_LOADING); 55 source->AddLocalizedString("loading", IDS_HISTORY_LOADING);
53 source->AddLocalizedString("moreActionsButton", 56 source->AddLocalizedString("moreActionsButton",
54 IDS_HISTORY_ACTION_MENU_DESCRIPTION); 57 IDS_HISTORY_ACTION_MENU_DESCRIPTION);
55 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE); 58 source->AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
56 source->AddLocalizedString("openAll", IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL); 59 source->AddLocalizedString("openAll", IDS_HISTORY_OTHER_SESSIONS_OPEN_ALL);
57 source->AddLocalizedString("openTabsMenuItem", 60 source->AddLocalizedString("openTabsMenuItem",
58 IDS_MD_HISTORY_OPEN_TABS_MENU_ITEM); 61 IDS_MD_HISTORY_OPEN_TABS_MENU_ITEM);
59 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS); 62 source->AddLocalizedString("noResults", IDS_HISTORY_NO_RESULTS);
60 source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS); 63 source->AddLocalizedString("noSearchResults", IDS_HISTORY_NO_SEARCH_RESULTS);
61 source->AddLocalizedString("noSyncedResults", 64 source->AddLocalizedString("noSyncedResults",
62 IDS_MD_HISTORY_NO_SYNCED_RESULTS); 65 IDS_MD_HISTORY_NO_SYNCED_RESULTS);
63 source->AddLocalizedString("rangeAllTime", IDS_HISTORY_RANGE_ALL_TIME); 66 source->AddLocalizedString("rangeAllTime", IDS_HISTORY_RANGE_ALL_TIME);
64 source->AddLocalizedString("rangeWeek", IDS_HISTORY_RANGE_WEEK); 67 source->AddLocalizedString("rangeWeek", IDS_HISTORY_RANGE_WEEK);
65 source->AddLocalizedString("rangeMonth", IDS_HISTORY_RANGE_MONTH); 68 source->AddLocalizedString("rangeMonth", IDS_HISTORY_RANGE_MONTH);
66 source->AddLocalizedString("rangeToday", IDS_HISTORY_RANGE_TODAY); 69 source->AddLocalizedString("rangeToday", IDS_HISTORY_RANGE_TODAY);
67 source->AddLocalizedString("rangeNext", IDS_HISTORY_RANGE_NEXT); 70 source->AddLocalizedString("rangeNext", IDS_HISTORY_RANGE_NEXT);
68 source->AddLocalizedString("rangePrevious", IDS_HISTORY_RANGE_PREVIOUS); 71 source->AddLocalizedString("rangePrevious", IDS_HISTORY_RANGE_PREVIOUS);
69 source->AddLocalizedString("removeBookmark", IDS_HISTORY_REMOVE_BOOKMARK); 72 source->AddLocalizedString("removeBookmark", IDS_HISTORY_REMOVE_BOOKMARK);
70 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE); 73 source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
74 source->AddLocalizedString("removeSelected",
75 IDS_HISTORY_REMOVE_SELECTED_ITEMS);
71 source->AddLocalizedString("searchPrompt", IDS_MD_HISTORY_SEARCH_PROMPT); 76 source->AddLocalizedString("searchPrompt", IDS_MD_HISTORY_SEARCH_PROMPT);
72 source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT); 77 source->AddLocalizedString("searchResult", IDS_HISTORY_SEARCH_RESULT);
73 source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS); 78 source->AddLocalizedString("searchResults", IDS_HISTORY_SEARCH_RESULTS);
74 source->AddLocalizedString("signInButton", IDS_MD_HISTORY_SIGN_IN_BUTTON); 79 source->AddLocalizedString("signInButton", IDS_MD_HISTORY_SIGN_IN_BUTTON);
75 source->AddLocalizedString("signInPromo", IDS_MD_HISTORY_SIGN_IN_PROMO); 80 source->AddLocalizedString("signInPromo", IDS_MD_HISTORY_SIGN_IN_PROMO);
76 source->AddLocalizedString("signInPromoDesc", 81 source->AddLocalizedString("signInPromoDesc",
77 IDS_MD_HISTORY_SIGN_IN_PROMO_DESC); 82 IDS_MD_HISTORY_SIGN_IN_PROMO_DESC);
78 source->AddLocalizedString("title", IDS_HISTORY_TITLE); 83 source->AddLocalizedString("title", IDS_HISTORY_TITLE);
79 84
85 source->AddString("deleteWarning",
86 HistoryUI::GetDeleteWarningString(profile));
87
80 bool allow_deleting_history = 88 bool allow_deleting_history =
81 prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory); 89 prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory);
82 source->AddBoolean("allowDeletingHistory", allow_deleting_history); 90 source->AddBoolean("allowDeletingHistory", allow_deleting_history);
83 91
84 bool group_by_domain = base::CommandLine::ForCurrentProcess()->HasSwitch( 92 bool group_by_domain = base::CommandLine::ForCurrentProcess()->HasSwitch(
85 switches::kHistoryEnableGroupByDomain) || profile->IsSupervised(); 93 switches::kHistoryEnableGroupByDomain) || profile->IsSupervised();
86 source->AddBoolean("groupByDomain", group_by_domain); 94 source->AddBoolean("groupByDomain", group_by_domain);
87 95
88 SigninManagerBase* signin_manager = 96 SigninManagerBase* signin_manager =
89 SigninManagerFactory::GetForProfile(profile); 97 SigninManagerFactory::GetForProfile(profile);
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 base::FeatureList::ClearInstanceForTesting(); 189 base::FeatureList::ClearInstanceForTesting();
182 base::FeatureList::SetInstance(std::move(feature_list)); 190 base::FeatureList::SetInstance(std::move(feature_list));
183 } 191 }
184 192
185 // static 193 // static
186 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes( 194 base::RefCountedMemory* MdHistoryUI::GetFaviconResourceBytes(
187 ui::ScaleFactor scale_factor) { 195 ui::ScaleFactor scale_factor) {
188 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( 196 return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
189 IDR_HISTORY_FAVICON, scale_factor); 197 IDR_HISTORY_FAVICON, scale_factor);
190 } 198 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/history_ui.cc ('k') | chrome/test/data/webui/md_history/history_list_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698