chrome/browser/android/bookmarks/partner_bookmarks_shim.h - Issue 284893003: Move bookmarks/core/... to bookmarks/...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/android/bookmarks/partner_bookmarks_shim.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:

View unified diff | Download patch

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_SHIM_H_	5 #ifndef CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_SHIM_H_

6 #define CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_SHIM_H_	6 #define CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_SHIM_H_

7	7

8 #include "base/android/jni_weak_ref.h"	8 #include "base/android/jni_weak_ref.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "base/strings/string16.h"	10 #include "base/strings/string16.h"

11 #include "base/supports_user_data.h"	11 #include "base/supports_user_data.h"

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

13 #include "url/gurl.h"	13 #include "url/gurl.h"

14	14

15 class PrefService;	15 class PrefService;

16	16

17 namespace content {	17 namespace content {

18 class BrowserContext;	18 class BrowserContext;

19 class WebContents;	19 class WebContents;

20 }	20 }

21	21

22 namespace user_prefs {	22 namespace user_prefs {

(...skipping 108 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
131 PrefService* prefs_;	131 PrefService* prefs_;

132 NodeRenamingMap node_rename_remove_map_;	132 NodeRenamingMap node_rename_remove_map_;

133	133

134 // The observers.	134 // The observers.

135 ObserverList<Observer> observers_;	135 ObserverList<Observer> observers_;

136	136

137 DISALLOW_COPY_AND_ASSIGN(PartnerBookmarksShim);	137 DISALLOW_COPY_AND_ASSIGN(PartnerBookmarksShim);

138 };	138 };

139	139

140 #endif // CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_SHIM_H_	140 #endif // CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_SHIM_H_

OLD	NEW