Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Side by Side Diff: components/bookmarks/browser/bookmark_model.cc

Issue 335453004: Move BookmarkExpandedStateTracker into bookmarks namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « components/bookmarks/browser/bookmark_model.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/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/browser/bookmark_expanded_state_tracker.h" 16 #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
17 #include "components/bookmarks/browser/bookmark_index.h" 17 #include "components/bookmarks/browser/bookmark_index.h"
18 #include "components/bookmarks/browser/bookmark_match.h" 18 #include "components/bookmarks/browser/bookmark_match.h"
19 #include "components/bookmarks/browser/bookmark_model_observer.h" 19 #include "components/bookmarks/browser/bookmark_model_observer.h"
20 #include "components/bookmarks/browser/bookmark_node_data.h" 20 #include "components/bookmarks/browser/bookmark_node_data.h"
21 #include "components/bookmarks/browser/bookmark_storage.h" 21 #include "components/bookmarks/browser/bookmark_storage.h"
22 #include "components/bookmarks/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/components_strings.h" 24 #include "grit/components_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 using bookmarks::BookmarkExpandedStateTracker;
29 using bookmarks::BookmarkIndex; 30 using bookmarks::BookmarkIndex;
30 using bookmarks::BookmarkLoadDetails; 31 using bookmarks::BookmarkLoadDetails;
31 using bookmarks::BookmarkMatch; 32 using bookmarks::BookmarkMatch;
32 using bookmarks::BookmarkStorage; 33 using bookmarks::BookmarkStorage;
33 34
34 namespace { 35 namespace {
35 36
36 // Helper to get a mutable bookmark node. 37 // Helper to get a mutable bookmark node.
37 BookmarkNode* AsMutable(const BookmarkNode* node) { 38 BookmarkNode* AsMutable(const BookmarkNode* node) {
38 return const_cast<BookmarkNode*>(node); 39 return const_cast<BookmarkNode*>(node);
(...skipping 967 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 BookmarkPermanentNode* mobile_node = 1007 BookmarkPermanentNode* mobile_node =
1007 CreatePermanentNode(BookmarkNode::MOBILE); 1008 CreatePermanentNode(BookmarkNode::MOBILE);
1008 return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails( 1009 return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails(
1009 bb_node, 1010 bb_node,
1010 other_node, 1011 other_node,
1011 mobile_node, 1012 mobile_node,
1012 client_->GetLoadExtraNodesCallback(), 1013 client_->GetLoadExtraNodesCallback(),
1013 new BookmarkIndex(client_, index_urls_, accept_languages), 1014 new BookmarkIndex(client_, index_urls_, accept_languages),
1014 next_node_id_)); 1015 next_node_id_));
1015 } 1016 }
OLDNEW
« no previous file with comments | « components/bookmarks/browser/bookmark_model.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698