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

Side by Side Diff: chrome/browser/android/tab_android.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_TAB_ANDROID_H_ 5 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
6 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 6 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/jni_weak_ref.h" 10 #include "base/android/jni_weak_ref.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 100
101 void MakeLoadURLParams( 101 void MakeLoadURLParams(
102 chrome::NavigateParams* params, 102 chrome::NavigateParams* params,
103 content::NavigationController::LoadURLParams* load_url_params); 103 content::NavigationController::LoadURLParams* load_url_params);
104 104
105 // CoreTabHelperDelegate ---------------------------------------------------- 105 // CoreTabHelperDelegate ----------------------------------------------------
106 106
107 virtual void SwapTabContents(content::WebContents* old_contents, 107 virtual void SwapTabContents(content::WebContents* old_contents,
108 content::WebContents* new_contents, 108 content::WebContents* new_contents,
109 bool did_start_load, 109 bool did_start_load,
110 bool did_finish_load) OVERRIDE; 110 bool did_finish_load) override;
111 111
112 // Overridden from SearchTabHelperDelegate: 112 // Overridden from SearchTabHelperDelegate:
113 virtual void OnWebContentsInstantSupportDisabled( 113 virtual void OnWebContentsInstantSupportDisabled(
114 const content::WebContents* web_contents) OVERRIDE; 114 const content::WebContents* web_contents) override;
115 115
116 // NotificationObserver ----------------------------------------------------- 116 // NotificationObserver -----------------------------------------------------
117 virtual void Observe(int type, 117 virtual void Observe(int type,
118 const content::NotificationSource& source, 118 const content::NotificationSource& source,
119 const content::NotificationDetails& details) OVERRIDE; 119 const content::NotificationDetails& details) override;
120 120
121 // Methods called from Java via JNI ----------------------------------------- 121 // Methods called from Java via JNI -----------------------------------------
122 122
123 virtual void Destroy(JNIEnv* env, jobject obj); 123 virtual void Destroy(JNIEnv* env, jobject obj);
124 virtual void InitWebContents(JNIEnv* env, 124 virtual void InitWebContents(JNIEnv* env,
125 jobject obj, 125 jobject obj,
126 jboolean incognito, 126 jboolean incognito,
127 jobject jcontent_view_core, 127 jobject jcontent_view_core,
128 jobject jweb_contents_delegate, 128 jobject jweb_contents_delegate,
129 jobject jcontext_menu_populator); 129 jobject jcontext_menu_populator);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 scoped_ptr<content::WebContents> web_contents_; 172 scoped_ptr<content::WebContents> web_contents_;
173 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 173 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
174 web_contents_delegate_; 174 web_contents_delegate_;
175 175
176 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; 176 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
177 177
178 DISALLOW_COPY_AND_ASSIGN(TabAndroid); 178 DISALLOW_COPY_AND_ASSIGN(TabAndroid);
179 }; 179 };
180 180
181 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 181 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/signin/signin_manager_android.cc ('k') | chrome/browser/android/thumbnail/thumbnail.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698