Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 225 void InitAutofillIfNecessary(bool enabled); | 225 void InitAutofillIfNecessary(bool enabled); |
| 226 | 226 |
| 227 void InitializeHardwareDrawIfNeeded(); | 227 void InitializeHardwareDrawIfNeeded(); |
| 228 void ReleaseHardwareDrawIfNeeded(); | 228 void ReleaseHardwareDrawIfNeeded(); |
| 229 | 229 |
| 230 // Geolocation API support | 230 // Geolocation API support |
| 231 void ShowGeolocationPrompt(const GURL& origin, base::Callback<void(bool)>); | 231 void ShowGeolocationPrompt(const GURL& origin, base::Callback<void(bool)>); |
| 232 void HideGeolocationPrompt(const GURL& origin); | 232 void HideGeolocationPrompt(const GURL& origin); |
| 233 | 233 |
| 234 JavaObjectWeakGlobalRef java_ref_; | 234 JavaObjectWeakGlobalRef java_ref_; |
| 235 scoped_ptr<content::WebContents> web_contents_; | |
| 236 scoped_ptr<AwWebContentsDelegate> web_contents_delegate_; | 235 scoped_ptr<AwWebContentsDelegate> web_contents_delegate_; |
| 237 scoped_ptr<AwContentsClientBridge> contents_client_bridge_; | 236 scoped_ptr<AwContentsClientBridge> contents_client_bridge_; |
| 237 scoped_ptr<content::WebContents> web_contents_; | |
|
hush (inactive)
2014/10/31 20:58:16
what's the purpose of this move?
boliu
2014/10/31 21:47:05
This is the "Reordered some native AwContents memb
| |
| 238 scoped_ptr<AwRenderViewHostExt> render_view_host_ext_; | 238 scoped_ptr<AwRenderViewHostExt> render_view_host_ext_; |
| 239 scoped_ptr<FindHelper> find_helper_; | 239 scoped_ptr<FindHelper> find_helper_; |
| 240 scoped_ptr<IconHelper> icon_helper_; | 240 scoped_ptr<IconHelper> icon_helper_; |
| 241 scoped_ptr<AwContents> pending_contents_; | 241 scoped_ptr<AwContents> pending_contents_; |
| 242 BrowserViewRenderer browser_view_renderer_; | 242 BrowserViewRenderer browser_view_renderer_; |
| 243 // SharedRendererState is owned by BrowserViewRenderer. | 243 // SharedRendererState is owned by BrowserViewRenderer. |
| 244 // So keep a raw pointer here. | 244 // So keep a raw pointer here. |
| 245 SharedRendererState* shared_renderer_state_; | 245 SharedRendererState* shared_renderer_state_; |
| 246 // TODO(hush): hardware renderer will be owned by SharedRendererState, | 246 // TODO(hush): hardware renderer will be owned by SharedRendererState, |
| 247 // after DrawGL is moved to SharedRendererState. | 247 // after DrawGL is moved to SharedRendererState. |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 260 GLViewRendererManager::Key renderer_manager_key_; | 260 GLViewRendererManager::Key renderer_manager_key_; |
| 261 | 261 |
| 262 DISALLOW_COPY_AND_ASSIGN(AwContents); | 262 DISALLOW_COPY_AND_ASSIGN(AwContents); |
| 263 }; | 263 }; |
| 264 | 264 |
| 265 bool RegisterAwContents(JNIEnv* env); | 265 bool RegisterAwContents(JNIEnv* env); |
| 266 | 266 |
| 267 } // namespace android_webview | 267 } // namespace android_webview |
| 268 | 268 |
| 269 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ | 269 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ |
| OLD | NEW |