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

Side by Side Diff: chrome/browser/android/bookmarks/bookmarks_bridge.h

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 years, 2 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_ 5 #ifndef CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_
6 #define CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_ 6 #define CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 base::string16 GetTitle(const BookmarkNode* node) const; 165 base::string16 GetTitle(const BookmarkNode* node) const;
166 bool IsReachable(const BookmarkNode* node) const; 166 bool IsReachable(const BookmarkNode* node) const;
167 bool IsLoaded() const; 167 bool IsLoaded() const;
168 bool IsFolderAvailable(const BookmarkNode* folder) const; 168 bool IsFolderAvailable(const BookmarkNode* folder) const;
169 void NotifyIfDoneLoading(); 169 void NotifyIfDoneLoading();
170 170
171 // Override BaseBookmarkModelObserver. 171 // Override BaseBookmarkModelObserver.
172 // Called when there are changes to the bookmark model that don't trigger 172 // Called when there are changes to the bookmark model that don't trigger
173 // any of the other callback methods. For example, this is called when 173 // any of the other callback methods. For example, this is called when
174 // partner bookmarks change. 174 // partner bookmarks change.
175 virtual void BookmarkModelChanged() OVERRIDE; 175 virtual void BookmarkModelChanged() override;
176 virtual void BookmarkModelLoaded(BookmarkModel* model, 176 virtual void BookmarkModelLoaded(BookmarkModel* model,
177 bool ids_reassigned) OVERRIDE; 177 bool ids_reassigned) override;
178 virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE; 178 virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override;
179 virtual void BookmarkNodeMoved(BookmarkModel* model, 179 virtual void BookmarkNodeMoved(BookmarkModel* model,
180 const BookmarkNode* old_parent, 180 const BookmarkNode* old_parent,
181 int old_index, 181 int old_index,
182 const BookmarkNode* new_parent, 182 const BookmarkNode* new_parent,
183 int new_index) OVERRIDE; 183 int new_index) override;
184 virtual void BookmarkNodeAdded(BookmarkModel* model, 184 virtual void BookmarkNodeAdded(BookmarkModel* model,
185 const BookmarkNode* parent, 185 const BookmarkNode* parent,
186 int index) OVERRIDE; 186 int index) override;
187 virtual void BookmarkNodeRemoved(BookmarkModel* model, 187 virtual void BookmarkNodeRemoved(BookmarkModel* model,
188 const BookmarkNode* parent, 188 const BookmarkNode* parent,
189 int old_index, 189 int old_index,
190 const BookmarkNode* node, 190 const BookmarkNode* node,
191 const std::set<GURL>& removed_urls) OVERRIDE; 191 const std::set<GURL>& removed_urls) override;
192 virtual void BookmarkNodeChanged(BookmarkModel* model, 192 virtual void BookmarkNodeChanged(BookmarkModel* model,
193 const BookmarkNode* node) OVERRIDE; 193 const BookmarkNode* node) override;
194 virtual void BookmarkNodeChildrenReordered(BookmarkModel* model, 194 virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
195 const BookmarkNode* node) OVERRIDE; 195 const BookmarkNode* node) override;
196 virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) OVERRIDE; 196 virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) override;
197 virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE; 197 virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override;
198 198
199 // Override PartnerBookmarksShim::Observer 199 // Override PartnerBookmarksShim::Observer
200 virtual void PartnerShimChanged(PartnerBookmarksShim* shim) OVERRIDE; 200 virtual void PartnerShimChanged(PartnerBookmarksShim* shim) override;
201 virtual void PartnerShimLoaded(PartnerBookmarksShim* shim) OVERRIDE; 201 virtual void PartnerShimLoaded(PartnerBookmarksShim* shim) override;
202 virtual void ShimBeingDeleted(PartnerBookmarksShim* shim) OVERRIDE; 202 virtual void ShimBeingDeleted(PartnerBookmarksShim* shim) override;
203 203
204 Profile* profile_; 204 Profile* profile_;
205 JavaObjectWeakGlobalRef weak_java_ref_; 205 JavaObjectWeakGlobalRef weak_java_ref_;
206 BookmarkModel* bookmark_model_; // weak 206 BookmarkModel* bookmark_model_; // weak
207 ChromeBookmarkClient* client_; // weak 207 ChromeBookmarkClient* client_; // weak
208 scoped_ptr<bookmarks::ScopedGroupBookmarkActions> grouped_bookmark_actions_; 208 scoped_ptr<bookmarks::ScopedGroupBookmarkActions> grouped_bookmark_actions_;
209 209
210 // Information about the Partner bookmarks (must check for IsLoaded()). 210 // Information about the Partner bookmarks (must check for IsLoaded()).
211 // This is owned by profile. 211 // This is owned by profile.
212 PartnerBookmarksShim* partner_bookmarks_shim_; 212 PartnerBookmarksShim* partner_bookmarks_shim_;
213 213
214 DISALLOW_COPY_AND_ASSIGN(BookmarksBridge); 214 DISALLOW_COPY_AND_ASSIGN(BookmarksBridge);
215 }; 215 };
216 216
217 #endif // CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_ 217 #endif // CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698