chrome/browser/ui/webui/browsing_history_handler.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/browsing_history_handler.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

Index: chrome/browser/ui/webui/browsing_history_handler.cc

diff --git a/chrome/browser/ui/webui/browsing_history_handler.cc b/chrome/browser/ui/webui/browsing_history_handler.cc

index 676a9c9e93b1ed1b7f6a1948634f377ab2b1298b..dbc8eccae65de458d204bbf0e76f789f42f31651 100644

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

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

@@ -39,7 +39,7 @@

#include "components/bookmarks/browser/bookmark_model.h"

#include "components/bookmarks/browser/bookmark_utils.h"

#include "components/browser_sync/profile_sync_service.h"

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

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

#include "components/favicon/core/fallback_icon_service.h"

#include "components/favicon/core/fallback_url_util.h"

#include "components/favicon/core/large_icon_service.h"

@@ -472,7 +472,7 @@ void BrowsingHistoryHandler::QueryHistory(

this, &BrowsingHistoryHandler::WebHistoryTimeout);

// Test the existence of other forms of browsing history.

- browsing_data_ui::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(

+ browsing_data::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(

ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile),

web_history,

base::Bind(

« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/webui/history_ui.cc » ('j') | no next file with comments »