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

Side by Side 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:

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 #include "components/bookmarks/core/browser/bookmark_model.h"	5 #include "components/bookmarks/browser/bookmark_model.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <functional>	8 #include <functional>

9	9

10 #include "base/bind.h"	10 #include "base/bind.h"

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

12 #include "base/i18n/string_compare.h"	12 #include "base/i18n/string_compare.h"

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

14 #include "base/macros.h"	14 #include "base/macros.h"

15 #include "base/strings/string_util.h"	15 #include "base/strings/string_util.h"

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

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

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

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

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

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

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

23 #include "components/favicon_base/favicon_types.h"	23 #include "components/favicon_base/favicon_types.h"

24 #include "grit/component_strings.h"	24 #include "grit/component_strings.h"

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

26 #include "ui/gfx/favicon_size.h"	26 #include "ui/gfx/favicon_size.h"

27	27

28 using base::Time;	28 using base::Time;

29	29

30 namespace {	30 namespace {

31	31

32 // Helper to get a mutable bookmark node.	32 // Helper to get a mutable bookmark node.

(...skipping 944 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
977 CreatePermanentNode(BookmarkNode::OTHER_NODE);	977 CreatePermanentNode(BookmarkNode::OTHER_NODE);

978 BookmarkPermanentNode* mobile_node =	978 BookmarkPermanentNode* mobile_node =

979 CreatePermanentNode(BookmarkNode::MOBILE);	979 CreatePermanentNode(BookmarkNode::MOBILE);

980 return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails(	980 return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails(

981 bb_node,	981 bb_node,

982 other_node,	982 other_node,

983 mobile_node,	983 mobile_node,

984 new BookmarkIndex(client_, index_urls_, accept_languages),	984 new BookmarkIndex(client_, index_urls_, accept_languages),

985 next_node_id_));	985 next_node_id_));

986 }	986 }

OLD	NEW

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