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

Side by Side Diff: chrome/browser/bookmarks/chrome_bookmark_client.h

Issue 961683002: Move ManagedBookmarksTracker from policy/core/browser to bookmarks/managed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add back to policy DEPS Created 5 years, 9 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
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/bookmarks/chrome_bookmark_client.cc » ('j') | 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 #ifndef CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_ 5 #ifndef CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_
6 #define CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_ 6 #define CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback_list.h" 11 #include "base/callback_list.h"
12 #include "base/deferred_sequenced_task_runner.h" 12 #include "base/deferred_sequenced_task_runner.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "components/bookmarks/browser/base_bookmark_model_observer.h" 14 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
15 #include "components/bookmarks/browser/bookmark_client.h" 15 #include "components/bookmarks/browser/bookmark_client.h"
16 #include "components/policy/core/browser/managed_bookmarks_tracker.h"
17 16
18 class GURL; 17 class GURL;
19 class HistoryServiceFactory; 18 class HistoryServiceFactory;
20 class Profile; 19 class Profile;
21 20
21 namespace base {
22 class ListValue;
23 }
24
22 namespace bookmarks { 25 namespace bookmarks {
23 class BookmarkModel; 26 class BookmarkModel;
27 class BookmarkNode;
28 class BookmarkPermanentNode;
29 class ManagedBookmarksTracker;
24 } 30 }
25 31
26 namespace history { 32 namespace history {
27 class HistoryService; 33 class HistoryService;
28 } 34 }
29 35
30 class ChromeBookmarkClient : public bookmarks::BookmarkClient, 36 class ChromeBookmarkClient : public bookmarks::BookmarkClient,
31 public bookmarks::BaseBookmarkModelObserver { 37 public bookmarks::BaseBookmarkModelObserver {
32 public: 38 public:
33 explicit ChromeBookmarkClient(Profile* profile); 39 explicit ChromeBookmarkClient(Profile* profile);
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 history::HistoryService* history_service_; 106 history::HistoryService* history_service_;
101 107
102 scoped_ptr<base::CallbackList<void(const std::set<GURL>&)>::Subscription> 108 scoped_ptr<base::CallbackList<void(const std::set<GURL>&)>::Subscription>
103 favicon_changed_subscription_; 109 favicon_changed_subscription_;
104 110
105 // Pointer to the BookmarkModel. Will be non-NULL from the call to Init to 111 // Pointer to the BookmarkModel. Will be non-NULL from the call to Init to
106 // the call to Shutdown. Must be valid for the whole interval. 112 // the call to Shutdown. Must be valid for the whole interval.
107 bookmarks::BookmarkModel* model_; 113 bookmarks::BookmarkModel* model_;
108 114
109 // Managed bookmarks are defined by an enterprise policy. 115 // Managed bookmarks are defined by an enterprise policy.
110 scoped_ptr<policy::ManagedBookmarksTracker> managed_bookmarks_tracker_; 116 scoped_ptr<bookmarks::ManagedBookmarksTracker> managed_bookmarks_tracker_;
111 // The top-level managed bookmarks folder. 117 // The top-level managed bookmarks folder.
112 bookmarks::BookmarkPermanentNode* managed_node_; 118 bookmarks::BookmarkPermanentNode* managed_node_;
113 119
114 // Supervised bookmarks are defined by the custodian of a supervised user. 120 // Supervised bookmarks are defined by the custodian of a supervised user.
115 scoped_ptr<policy::ManagedBookmarksTracker> supervised_bookmarks_tracker_; 121 scoped_ptr<bookmarks::ManagedBookmarksTracker> supervised_bookmarks_tracker_;
116 // The top-level supervised bookmarks folder. 122 // The top-level supervised bookmarks folder.
117 bookmarks::BookmarkPermanentNode* supervised_node_; 123 bookmarks::BookmarkPermanentNode* supervised_node_;
118 124
119 DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClient); 125 DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClient);
120 }; 126 };
121 127
122 #endif // CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_ 128 #endif // CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/bookmarks/chrome_bookmark_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698