components/bookmarks/browser/bookmark_model.cc - Issue 284893003: Move bookmarks/core/... to bookmarks/...

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/bookmarks/browser/bookmark_model.cc

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing errors reported by presubmit Created 6 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:

Index: components/bookmarks/browser/bookmark_model.cc

diff --git a/components/bookmarks/core/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc

similarity index 98%

rename from components/bookmarks/core/browser/bookmark_model.cc

rename to components/bookmarks/browser/bookmark_model.cc

index 27911465f3ff60ae529ea64bdf423b50e0a8a2cf..3caf66148d77bdc278f4934c8cfa8bd48e201ccf 100644

--- a/components/bookmarks/core/browser/bookmark_model.cc

+++ b/components/bookmarks/browser/bookmark_model.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/bookmarks/core/browser/bookmark_model.h"

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

#include <algorithm>

#include <functional>

@@ -13,13 +13,13 @@

#include "base/logging.h"

#include "base/macros.h"

#include "base/strings/string_util.h"

-#include "components/bookmarks/core/browser/bookmark_expanded_state_tracker.h"

-#include "components/bookmarks/core/browser/bookmark_index.h"

-#include "components/bookmarks/core/browser/bookmark_match.h"

-#include "components/bookmarks/core/browser/bookmark_model_observer.h"

-#include "components/bookmarks/core/browser/bookmark_node_data.h"

-#include "components/bookmarks/core/browser/bookmark_storage.h"

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

+#include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"

+#include "components/bookmarks/browser/bookmark_index.h"

+#include "components/bookmarks/browser/bookmark_match.h"

+#include "components/bookmarks/browser/bookmark_model_observer.h"

+#include "components/bookmarks/browser/bookmark_node_data.h"

+#include "components/bookmarks/browser/bookmark_storage.h"

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

#include "components/favicon_base/favicon_types.h"

#include "grit/component_strings.h"

#include "ui/base/l10n/l10n_util.h"