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

View unified diff | Download patch

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_MODEL_H_	5 #ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_

6 #define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_MODEL_H_	6 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_

7	7

8 #include <map>	8 #include <map>

9 #include <set>	9 #include <set>

10 #include <vector>	10 #include <vector>

11	11

12 #include "base/basictypes.h"	12 #include "base/basictypes.h"

13 #include "base/compiler_specific.h"	13 #include "base/compiler_specific.h"

14 #include "base/memory/ref_counted.h"	14 #include "base/memory/ref_counted.h"

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

16 #include "base/observer_list.h"	16 #include "base/observer_list.h"

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

18 #include "base/synchronization/lock.h"	18 #include "base/synchronization/lock.h"

19 #include "base/synchronization/waitable_event.h"	19 #include "base/synchronization/waitable_event.h"

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

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

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

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

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

25	25

26 class BookmarkExpandedStateTracker;	26 class BookmarkExpandedStateTracker;

27 class BookmarkIndex;	27 class BookmarkIndex;

28 class BookmarkLoadDetails;	28 class BookmarkLoadDetails;

29 class BookmarkModelObserver;	29 class BookmarkModelObserver;

30 class BookmarkStorage;	30 class BookmarkStorage;

31 struct BookmarkMatch;	31 struct BookmarkMatch;

32 class PrefService;	32 class PrefService;

(...skipping 381 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
414 base::WaitableEvent loaded_signal_;	414 base::WaitableEvent loaded_signal_;

415	415

416 // See description of IsDoingExtensiveChanges above.	416 // See description of IsDoingExtensiveChanges above.

417 int extensive_changes_;	417 int extensive_changes_;

418	418

419 scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;	419 scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;

420	420

421 DISALLOW_COPY_AND_ASSIGN(BookmarkModel);	421 DISALLOW_COPY_AND_ASSIGN(BookmarkModel);

422 };	422 };

423	423

424 #endif // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_MODEL_H_	424 #endif // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_

OLD	NEW

« no previous file with comments | « components/bookmarks/browser/bookmark_match.cc ('k') | components/bookmarks/browser/bookmark_model.cc » ('j') | no next file with comments »