components/browsing_data/core/history_notice_utils.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: components/browsing_data/core/history_notice_utils.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 | « components/browsing_data/core/history_notice_utils.h ('k') | components/browsing_data/core/history_notice_utils_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/browsing_data/core/history_notice_utils.cc

diff --git a/components/browsing_data_ui/history_notice_utils.cc b/components/browsing_data/core/history_notice_utils.cc

similarity index 96%

rename from components/browsing_data_ui/history_notice_utils.cc

rename to components/browsing_data/core/history_notice_utils.cc

index f3556f3012fe73137a0971bf93e8833a02dbe65e..012ba3f7887ab14eb57ee129b55534d691800680 100644

--- a/components/browsing_data_ui/history_notice_utils.cc

+++ b/components/browsing_data/core/history_notice_utils.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

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

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

#include "base/bind.h"

#include "base/callback.h"

@@ -51,7 +51,7 @@ class MergeBooleanCallbacks {

} // namespace

-namespace browsing_data_ui {

+namespace browsing_data {

namespace testing {

@@ -112,4 +112,4 @@ void ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(

&MergeBooleanCallbacks::RunCallback, base::Unretained(merger)));

}

-} // namespace browsing_data_ui

+} // namespace browsing_data