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

Side by Side Diff: chrome/browser/android/provider/chrome_browser_provider.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 (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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 virtual ~ChromeBrowserProvider();
176 176
177 // Override BaseBookmarkModelObserver. 177 // Override BaseBookmarkModelObserver.
178 virtual void BookmarkModelChanged() OVERRIDE; 178 virtual void BookmarkModelChanged() override;
179 virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) OVERRIDE; 179 virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) override;
180 virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE; 180 virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override;
181 181
182 // Override NotificationObserver. 182 // Override NotificationObserver.
183 virtual void Observe(int type, 183 virtual void Observe(int type,
184 const content::NotificationSource& source, 184 const content::NotificationSource& source,
185 const content::NotificationDetails& details) OVERRIDE; 185 const content::NotificationDetails& details) override;
186 186
187 JavaObjectWeakGlobalRef weak_java_provider_; 187 JavaObjectWeakGlobalRef weak_java_provider_;
188 188
189 Profile* profile_; 189 Profile* profile_;
190 BookmarkModel* bookmark_model_; 190 BookmarkModel* bookmark_model_;
191 history::TopSites* top_sites_; 191 history::TopSites* top_sites_;
192 192
193 scoped_ptr<AndroidHistoryProviderService> service_; 193 scoped_ptr<AndroidHistoryProviderService> service_;
194 scoped_ptr<FaviconService> favicon_service_; 194 scoped_ptr<FaviconService> favicon_service_;
195 195
196 base::CancelableTaskTracker cancelable_task_tracker_; 196 base::CancelableTaskTracker cancelable_task_tracker_;
197 197
198 // Used to register/unregister notification observer. 198 // Used to register/unregister notification observer.
199 content::NotificationRegistrar notification_registrar_; 199 content::NotificationRegistrar notification_registrar_;
200 200
201 bool handling_extensive_changes_; 201 bool handling_extensive_changes_;
202 202
203 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserProvider); 203 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserProvider);
204 }; 204 };
205 205
206 #endif // CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_ 206 #endif // CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698