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

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.h

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

similarity index 97%

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

rename to components/bookmarks/browser/bookmark_model.h

index 818929f6ac466060e7d902f1fdfe55331d548b60..de7a2c80b1960f86524ceb0a74188b4e4f05e089 100644

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

+++ b/components/bookmarks/browser/bookmark_model.h

@@ -2,8 +2,8 @@

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

// found in the LICENSE file.

-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_MODEL_H_

-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_MODEL_H_

+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_

+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_

#include <map>

#include <set>

@@ -17,9 +17,9 @@

#include "base/strings/string16.h"

#include "base/synchronization/lock.h"

#include "base/synchronization/waitable_event.h"

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

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

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

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

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

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

#include "ui/gfx/image/image.h"

#include "url/gurl.h"

@@ -421,4 +421,4 @@ class BookmarkModel : public BookmarkService {

DISALLOW_COPY_AND_ASSIGN(BookmarkModel);

};

-#endif // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_MODEL_H_

+#endif // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_