chrome/browser/ui/webui/history_ui.cc - Issue 2238453002: Merge //components/browsing_data_ui into //components/browsing_data/core

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/history_ui.cc

Issue 2238453002: Merge //components/browsing_data_ui into //components/browsing_data/core (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase over https://codereview.chromium.org/2345843003/ Created 4 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/browsing_history_handler.cc ('k') | chrome/browser/ui/webui/options/clear_browser_data_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 3adf84f8e98bc78ca1eed270c4be040d38e942f1..af647cee1d892e757c1c8f857a9cdca3b71c29c7 100644

--- a/chrome/browser/ui/webui/history_ui.cc

+++ b/chrome/browser/ui/webui/history_ui.cc

@@ -22,8 +22,8 @@

#include "chrome/grit/browser_resources.h"

#include "chrome/grit/generated_resources.h"

#include "chrome/grit/theme_resources.h"

+#include "components/browsing_data/core/history_notice_utils.h"

#include "components/browsing_data/core/pref_names.h"

-#include "components/browsing_data_ui/history_notice_utils.h"

#include "components/grit/components_scaled_resources.h"

#include "components/prefs/pref_service.h"

#include "components/search/search.h"

@@ -194,7 +194,7 @@ HistoryUI::HistoryUI(content::WebUI* web_ui) : WebUIController(web_ui) {

if (url.has_query() && url.query() == "reset_ofbh") {

Profile::FromWebUI(web_ui)->GetPrefs()->SetInteger(

browsing_data::prefs::kClearBrowsingDataHistoryNoticeShownTimes, 0);

- browsing_data_ui::testing::

+ browsing_data::testing::

g_override_other_forms_of_browsing_history_query = true;

}