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

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

Issue 372663002: Fix BookmarkPermanentNode leak in ChromeBookmarkClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Gab's comments. Created 6 years, 5 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 | « no previous file | 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 <vector> 8 #include <vector>
9 9
10 #include "base/deferred_sequenced_task_runner.h" 10 #include "base/deferred_sequenced_task_runner.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 const std::set<GURL>& removed_urls) OVERRIDE; 77 const std::set<GURL>& removed_urls) OVERRIDE;
78 virtual void BookmarkAllUserNodesRemoved( 78 virtual void BookmarkAllUserNodesRemoved(
79 BookmarkModel* model, 79 BookmarkModel* model,
80 const std::set<GURL>& removed_urls) OVERRIDE; 80 const std::set<GURL>& removed_urls) OVERRIDE;
81 virtual void BookmarkModelLoaded(BookmarkModel* model, 81 virtual void BookmarkModelLoaded(BookmarkModel* model,
82 bool ids_reassigned) OVERRIDE; 82 bool ids_reassigned) OVERRIDE;
83 83
84 // Helper for GetLoadExtraNodesCallback(). 84 // Helper for GetLoadExtraNodesCallback().
85 static bookmarks::BookmarkPermanentNodeList LoadExtraNodes( 85 static bookmarks::BookmarkPermanentNodeList LoadExtraNodes(
86 const scoped_refptr<base::DeferredSequencedTaskRunner>& profile_io_runner, 86 const scoped_refptr<base::DeferredSequencedTaskRunner>& profile_io_runner,
87 BookmarkPermanentNode* managed_node, 87 scoped_ptr<BookmarkPermanentNode> managed_node,
88 scoped_ptr<base::ListValue> initial_managed_bookmarks, 88 scoped_ptr<base::ListValue> initial_managed_bookmarks,
89 int64* next_node_id); 89 int64* next_node_id);
90 90
91 // Returns the management domain that configured the managed bookmarks, 91 // Returns the management domain that configured the managed bookmarks,
92 // or an empty string. 92 // or an empty string.
93 std::string GetManagedBookmarksDomain(); 93 std::string GetManagedBookmarksDomain();
94 94
95 Profile* profile_; 95 Profile* profile_;
96 96
97 content::NotificationRegistrar registrar_; 97 content::NotificationRegistrar registrar_;
98 98
99 // Pointer to the BookmarkModel. Will be non-NULL from the call to Init to 99 // Pointer to the BookmarkModel. Will be non-NULL from the call to Init to
100 // the call to Shutdown. Must be valid for the whole interval. 100 // the call to Shutdown. Must be valid for the whole interval.
101 BookmarkModel* model_; 101 BookmarkModel* model_;
102 102
103 scoped_ptr<policy::ManagedBookmarksTracker> managed_bookmarks_tracker_; 103 scoped_ptr<policy::ManagedBookmarksTracker> managed_bookmarks_tracker_;
104 BookmarkPermanentNode* managed_node_; 104 BookmarkPermanentNode* managed_node_;
105 105
106 DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClient); 106 DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClient);
107 }; 107 };
108 108
109 #endif // CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_ 109 #endif // CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/bookmarks/chrome_bookmark_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698