Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #include "android_webview/native/aw_contents.h" | 5 #include "android_webview/native/aw_contents.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "android_webview/browser/aw_browser_context.h" | 10 #include "android_webview/browser/aw_browser_context.h" |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 165 AwContents* aw_contents = AwContents::FromWebContents( | 165 AwContents* aw_contents = AwContents::FromWebContents( |
| 166 content::WebContents::FromRenderFrameHost( | 166 content::WebContents::FromRenderFrameHost( |
| 167 content::RenderFrameHost::FromID(render_process_id, | 167 content::RenderFrameHost::FromID(render_process_id, |
| 168 render_frame_id))); | 168 render_frame_id))); |
| 169 return aw_contents; | 169 return aw_contents; |
| 170 } | 170 } |
| 171 | 171 |
| 172 AwContents::AwContents(std::unique_ptr<WebContents> web_contents) | 172 AwContents::AwContents(std::unique_ptr<WebContents> web_contents) |
| 173 : functor_(nullptr), | 173 : functor_(nullptr), |
| 174 browser_view_renderer_( | 174 browser_view_renderer_( |
| 175 web_contents.get(), | |
| 175 this, | 176 this, |
| 176 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)), | 177 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)), |
| 177 web_contents_(std::move(web_contents)), | 178 web_contents_(std::move(web_contents)), |
|
boliu
2016/06/03 02:18:20
you need to fix declaration order, otherwise BVR d
hush (inactive)
2016/06/09 22:44:53
great.
I moved web_contents_ above bvr_
| |
| 178 renderer_manager_key_(GLViewRendererManager::GetInstance()->NullKey()) { | 179 renderer_manager_key_(GLViewRendererManager::GetInstance()->NullKey()) { |
| 179 base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, 1); | 180 base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, 1); |
| 180 icon_helper_.reset(new IconHelper(web_contents_.get())); | 181 icon_helper_.reset(new IconHelper(web_contents_.get())); |
| 181 icon_helper_->SetListener(this); | 182 icon_helper_->SetListener(this); |
| 182 web_contents_->SetUserData(android_webview::kAwContentsUserDataKey, | 183 web_contents_->SetUserData(android_webview::kAwContentsUserDataKey, |
| 183 new AwContentsUserData(this)); | 184 new AwContentsUserData(this)); |
| 184 browser_view_renderer_.RegisterWithWebContents(web_contents_.get()); | 185 browser_view_renderer_.RegisterWithWebContents(web_contents_.get()); |
| 185 render_view_host_ext_.reset( | 186 render_view_host_ext_.reset( |
| 186 new AwRenderViewHostExt(this, web_contents_.get())); | 187 new AwRenderViewHostExt(this, web_contents_.get())); |
| 187 | 188 |
| (...skipping 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1279 const JavaParamRef<jobject>& obj) { | 1280 const JavaParamRef<jobject>& obj) { |
| 1280 web_contents_->ResumeLoadingCreatedWebContents(); | 1281 web_contents_->ResumeLoadingCreatedWebContents(); |
| 1281 } | 1282 } |
| 1282 | 1283 |
| 1283 void SetShouldDownloadFavicons(JNIEnv* env, | 1284 void SetShouldDownloadFavicons(JNIEnv* env, |
| 1284 const JavaParamRef<jclass>& jclazz) { | 1285 const JavaParamRef<jclass>& jclazz) { |
| 1285 g_should_download_favicons = true; | 1286 g_should_download_favicons = true; |
| 1286 } | 1287 } |
| 1287 | 1288 |
| 1288 } // namespace android_webview | 1289 } // namespace android_webview |
| OLD | NEW |