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

Side by Side Diff: chrome/browser/android/tab_android.h

Issue 2475213002: Update the Google Search geolocation disclosure to make it more obvious. (Closed)
Patch Set: Created 4 years, 1 month 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 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 const base::android::JavaParamRef<jobject>& jtab_content_manager); 257 const base::android::JavaParamRef<jobject>& jtab_content_manager);
258 258
259 bool HasPrerenderedUrl(JNIEnv* env, 259 bool HasPrerenderedUrl(JNIEnv* env,
260 const base::android::JavaParamRef<jobject>& obj, 260 const base::android::JavaParamRef<jobject>& obj,
261 const base::android::JavaParamRef<jstring>& url); 261 const base::android::JavaParamRef<jstring>& url);
262 262
263 // Register the Tab's native methods through JNI. 263 // Register the Tab's native methods through JNI.
264 static bool RegisterTabAndroid(JNIEnv* env); 264 static bool RegisterTabAndroid(JNIEnv* env);
265 265
266 private: 266 private:
267 void MaybeShowDefaultSearchGeolocationDisclosure(GURL gurl);
267 prerender::PrerenderManager* GetPrerenderManager() const; 268 prerender::PrerenderManager* GetPrerenderManager() const;
268 269
269 JavaObjectWeakGlobalRef weak_java_tab_; 270 JavaObjectWeakGlobalRef weak_java_tab_;
270 271
271 // The identifier used by session restore for this tab. 272 // The identifier used by session restore for this tab.
272 SessionID session_tab_id_; 273 SessionID session_tab_id_;
273 274
274 // Identifier of the window the tab is in. 275 // Identifier of the window the tab is in.
275 SessionID session_window_id_; 276 SessionID session_window_id_;
276 277
277 content::NotificationRegistrar notification_registrar_; 278 content::NotificationRegistrar notification_registrar_;
278 279
279 scoped_refptr<cc::Layer> content_layer_; 280 scoped_refptr<cc::Layer> content_layer_;
280 android::TabContentManager* tab_content_manager_; 281 android::TabContentManager* tab_content_manager_;
281 282
282 std::unique_ptr<content::WebContents> web_contents_; 283 std::unique_ptr<content::WebContents> web_contents_;
283 std::unique_ptr<android::TabWebContentsDelegateAndroid> 284 std::unique_ptr<android::TabWebContentsDelegateAndroid>
284 web_contents_delegate_; 285 web_contents_delegate_;
285 286
286 std::unique_ptr<blimp::client::BlimpContents> blimp_contents_; 287 std::unique_ptr<blimp::client::BlimpContents> blimp_contents_;
287 288
288 std::unique_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; 289 std::unique_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
289 290
290 DISALLOW_COPY_AND_ASSIGN(TabAndroid); 291 DISALLOW_COPY_AND_ASSIGN(TabAndroid);
291 }; 292 };
292 293
293 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 294 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698