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

Side by Side Diff: chrome/browser/android/provider/chrome_browser_provider.h

Issue 884213005: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_PROVIDER_CHROME_BROWSER_PROVIDER_H_ 5 #ifndef CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_
6 #define CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_ 6 #define CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_
7 7
8 #include "base/android/jni_weak_ref.h" 8 #include "base/android/jni_weak_ref.h"
9 #include "base/android/scoped_java_ref.h" 9 #include "base/android/scoped_java_ref.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 base::android::ScopedJavaLocalRef<jbyteArray> GetFaviconOrTouchIcon( 165 base::android::ScopedJavaLocalRef<jbyteArray> GetFaviconOrTouchIcon(
166 JNIEnv* env, 166 JNIEnv* env,
167 jobject obj, 167 jobject obj,
168 jstring url); 168 jstring url);
169 169
170 base::android::ScopedJavaLocalRef<jbyteArray> GetThumbnail(JNIEnv* env, 170 base::android::ScopedJavaLocalRef<jbyteArray> GetThumbnail(JNIEnv* env,
171 jobject obj, 171 jobject obj,
172 jstring url); 172 jstring url);
173 173
174 private: 174 private:
175 virtual ~ChromeBrowserProvider(); 175 ~ChromeBrowserProvider() override;
176 176
177 // Override bookmarks::BaseBookmarkModelObserver. 177 // Override bookmarks::BaseBookmarkModelObserver.
178 virtual void BookmarkModelChanged() override; 178 void BookmarkModelChanged() override;
179 virtual void ExtensiveBookmarkChangesBeginning( 179 void ExtensiveBookmarkChangesBeginning(
180 bookmarks::BookmarkModel* model) override; 180 bookmarks::BookmarkModel* model) override;
181 virtual void ExtensiveBookmarkChangesEnded( 181 void ExtensiveBookmarkChangesEnded(bookmarks::BookmarkModel* model) override;
182 bookmarks::BookmarkModel* model) override;
183 182
184 // Deals with updates to the history service. 183 // Deals with updates to the history service.
185 void OnHistoryChanged(); 184 void OnHistoryChanged();
186 185
187 // Override history::HistoryServiceObserver. 186 // Override history::HistoryServiceObserver.
188 void OnURLVisited(HistoryService* history_service, 187 void OnURLVisited(HistoryService* history_service,
189 ui::PageTransition transition, 188 ui::PageTransition transition,
190 const history::URLRow& row, 189 const history::URLRow& row,
191 const history::RedirectList& redirects, 190 const history::RedirectList& redirects,
192 base::Time visit_time) override; 191 base::Time visit_time) override;
(...skipping 27 matching lines...) Expand all
220 219
221 ScopedObserver<HistoryService, HistoryServiceObserver> 220 ScopedObserver<HistoryService, HistoryServiceObserver>
222 history_service_observer_; 221 history_service_observer_;
223 222
224 bool handling_extensive_changes_; 223 bool handling_extensive_changes_;
225 224
226 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserProvider); 225 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserProvider);
227 }; 226 };
228 227
229 #endif // CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_ 228 #endif // CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698