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

Side by Side Diff: android_webview/native/aw_contents.h

Issue 690553002: aw: Destroy ContentViewCore and WebContents together (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test to ShouldOverrideUrlLoading Created 6 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 ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 5 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <list> 9 #include <list>
10 #include <string> 10 #include <string>
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 void InitAutofillIfNecessary(bool enabled); 226 void InitAutofillIfNecessary(bool enabled);
227 227
228 void InitializeHardwareDrawIfNeeded(); 228 void InitializeHardwareDrawIfNeeded();
229 void ReleaseHardwareDrawIfNeeded(); 229 void ReleaseHardwareDrawIfNeeded();
230 230
231 // Geolocation API support 231 // Geolocation API support
232 void ShowGeolocationPrompt(const GURL& origin, base::Callback<void(bool)>); 232 void ShowGeolocationPrompt(const GURL& origin, base::Callback<void(bool)>);
233 void HideGeolocationPrompt(const GURL& origin); 233 void HideGeolocationPrompt(const GURL& origin);
234 234
235 JavaObjectWeakGlobalRef java_ref_; 235 JavaObjectWeakGlobalRef java_ref_;
236 scoped_ptr<content::WebContents> web_contents_;
237 scoped_ptr<AwWebContentsDelegate> web_contents_delegate_; 236 scoped_ptr<AwWebContentsDelegate> web_contents_delegate_;
238 scoped_ptr<AwContentsClientBridge> contents_client_bridge_; 237 scoped_ptr<AwContentsClientBridge> contents_client_bridge_;
238 scoped_ptr<content::WebContents> web_contents_;
239 scoped_ptr<AwRenderViewHostExt> render_view_host_ext_; 239 scoped_ptr<AwRenderViewHostExt> render_view_host_ext_;
240 scoped_ptr<FindHelper> find_helper_; 240 scoped_ptr<FindHelper> find_helper_;
241 scoped_ptr<IconHelper> icon_helper_; 241 scoped_ptr<IconHelper> icon_helper_;
242 scoped_ptr<AwContents> pending_contents_; 242 scoped_ptr<AwContents> pending_contents_;
243 BrowserViewRenderer browser_view_renderer_; 243 BrowserViewRenderer browser_view_renderer_;
244 // SharedRendererState is owned by BrowserViewRenderer. 244 // SharedRendererState is owned by BrowserViewRenderer.
245 // So keep a raw pointer here. 245 // So keep a raw pointer here.
246 // TODO(hush): remove this pointer from AwContents. 246 // TODO(hush): remove this pointer from AwContents.
247 SharedRendererState* shared_renderer_state_; 247 SharedRendererState* shared_renderer_state_;
248 scoped_ptr<AwPdfExporter> pdf_exporter_; 248 scoped_ptr<AwPdfExporter> pdf_exporter_;
(...skipping 10 matching lines...) Expand all
259 GLViewRendererManager::Key renderer_manager_key_; 259 GLViewRendererManager::Key renderer_manager_key_;
260 260
261 DISALLOW_COPY_AND_ASSIGN(AwContents); 261 DISALLOW_COPY_AND_ASSIGN(AwContents);
262 }; 262 };
263 263
264 bool RegisterAwContents(JNIEnv* env); 264 bool RegisterAwContents(JNIEnv* env);
265 265
266 } // namespace android_webview 266 } // namespace android_webview
267 267
268 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 268 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698