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

Side by Side Diff: chrome/browser/android/tab_android.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_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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 static TabAndroid* FromWebContents(content::WebContents* web_contents); 64 static TabAndroid* FromWebContents(content::WebContents* web_contents);
65 65
66 // Returns the native TabAndroid stored in the Java Tab represented by 66 // Returns the native TabAndroid stored in the Java Tab represented by
67 // |obj|. 67 // |obj|.
68 static TabAndroid* GetNativeTab(JNIEnv* env, jobject obj); 68 static TabAndroid* GetNativeTab(JNIEnv* env, jobject obj);
69 69
70 // Function to attach helpers to the contentView. 70 // Function to attach helpers to the contentView.
71 static void AttachTabHelpers(content::WebContents* web_contents); 71 static void AttachTabHelpers(content::WebContents* web_contents);
72 72
73 TabAndroid(JNIEnv* env, jobject obj); 73 TabAndroid(JNIEnv* env, jobject obj);
74 virtual ~TabAndroid(); 74 ~TabAndroid() override;
75 75
76 base::android::ScopedJavaLocalRef<jobject> GetJavaObject(); 76 base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
77 77
78 // Return the WebContents, if any, currently owned by this TabAndroid. 78 // Return the WebContents, if any, currently owned by this TabAndroid.
79 content::WebContents* web_contents() const { return web_contents_.get(); } 79 content::WebContents* web_contents() const { return web_contents_.get(); }
80 80
81 // Return specific id information regarding this TabAndroid. 81 // Return specific id information regarding this TabAndroid.
82 const SessionID& session_id() const { return session_tab_id_; } 82 const SessionID& session_id() const { return session_tab_id_; }
83 int GetAndroidId() const; 83 int GetAndroidId() const;
84 int GetSyncId() const; 84 int GetSyncId() const;
(...skipping 19 matching lines...) Expand all
104 virtual void HandlePopupNavigation(chrome::NavigateParams* params); 104 virtual void HandlePopupNavigation(chrome::NavigateParams* params);
105 105
106 bool HasPrerenderedUrl(GURL gurl); 106 bool HasPrerenderedUrl(GURL gurl);
107 107
108 void MakeLoadURLParams( 108 void MakeLoadURLParams(
109 chrome::NavigateParams* params, 109 chrome::NavigateParams* params,
110 content::NavigationController::LoadURLParams* load_url_params); 110 content::NavigationController::LoadURLParams* load_url_params);
111 111
112 // CoreTabHelperDelegate ---------------------------------------------------- 112 // CoreTabHelperDelegate ----------------------------------------------------
113 113
114 virtual void SwapTabContents(content::WebContents* old_contents, 114 void SwapTabContents(content::WebContents* old_contents,
115 content::WebContents* new_contents, 115 content::WebContents* new_contents,
116 bool did_start_load, 116 bool did_start_load,
117 bool did_finish_load) override; 117 bool did_finish_load) override;
118 118
119 // Overridden from InstantServiceObserver: 119 // Overridden from InstantServiceObserver:
120 void DefaultSearchProviderChanged() override; 120 void DefaultSearchProviderChanged() override;
121 121
122 // Overridden from SearchTabHelperDelegate: 122 // Overridden from SearchTabHelperDelegate:
123 virtual void OnWebContentsInstantSupportDisabled( 123 void OnWebContentsInstantSupportDisabled(
124 const content::WebContents* web_contents) override; 124 const content::WebContents* web_contents) override;
125 125
126 // NotificationObserver ----------------------------------------------------- 126 // NotificationObserver -----------------------------------------------------
127 virtual void Observe(int type, 127 void Observe(int type,
128 const content::NotificationSource& source, 128 const content::NotificationSource& source,
129 const content::NotificationDetails& details) override; 129 const content::NotificationDetails& details) override;
130 130
131 // FaviconTabHelperObserver ----------------------------------------------- 131 // FaviconTabHelperObserver -----------------------------------------------
132 virtual void OnFaviconAvailable(const gfx::Image& image) override; 132 void OnFaviconAvailable(const gfx::Image& image) override;
133 133
134 // Methods called from Java via JNI ----------------------------------------- 134 // Methods called from Java via JNI -----------------------------------------
135 135
136 virtual void Destroy(JNIEnv* env, jobject obj); 136 virtual void Destroy(JNIEnv* env, jobject obj);
137 virtual void InitWebContents(JNIEnv* env, 137 virtual void InitWebContents(JNIEnv* env,
138 jobject obj, 138 jobject obj,
139 jboolean incognito, 139 jboolean incognito,
140 jobject jcontent_view_core, 140 jobject jcontent_view_core,
141 jobject jweb_contents_delegate, 141 jobject jweb_contents_delegate,
142 jobject jcontext_menu_populator); 142 jobject jcontext_menu_populator);
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 scoped_ptr<content::WebContents> web_contents_; 205 scoped_ptr<content::WebContents> web_contents_;
206 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 206 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
207 web_contents_delegate_; 207 web_contents_delegate_;
208 208
209 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; 209 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
210 210
211 DISALLOW_COPY_AND_ASSIGN(TabAndroid); 211 DISALLOW_COPY_AND_ASSIGN(TabAndroid);
212 }; 212 };
213 213
214 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 214 #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