diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 19:57:28 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 19:57:28 +0000 |
| commit | ac60536e1378b3005629fd1167fef96142415fd2 (patch) | |
| tree | 61c0817dbf3ce8f1dbdf112b3eb8f1d07a5dfee3 /android_webview | |
| parent | 2c30525561fd5e2dad7cc49555220098a0e85c6a (diff) | |
| download | chromium_src-ac60536e1378b3005629fd1167fef96142415fd2.zip chromium_src-ac60536e1378b3005629fd1167fef96142415fd2.tar.gz chromium_src-ac60536e1378b3005629fd1167fef96142415fd2.tar.bz2 | |
android_webview: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST.
It's no longer providing value as the MSVC warning is disabled during compilation. Refer to bug for details.
BUG=234765
Review URL: https://codereview.chromium.org/14497005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
4 files changed, 6 insertions, 6 deletions
diff --git a/android_webview/browser/browser_view_renderer_impl.cc b/android_webview/browser/browser_view_renderer_impl.cc index 3c3a1fd..67612ac 100644 --- a/android_webview/browser/browser_view_renderer_impl.cc +++ b/android_webview/browser/browser_view_renderer_impl.cc @@ -132,7 +132,7 @@ BrowserViewRendererImpl::BrowserViewRendererImpl( : client_(client), java_helper_(java_helper), view_renderer_host_(new ViewRendererHost(NULL, this)), - ALLOW_THIS_IN_INITIALIZER_LIST(compositor_(Compositor::Create(this))), + compositor_(Compositor::Create(this)), view_clip_layer_(cc::Layer::Create()), transform_layer_(cc::Layer::Create()), scissor_clip_layer_(cc::Layer::Create()), @@ -147,7 +147,7 @@ BrowserViewRendererImpl::BrowserViewRendererImpl( web_contents_(NULL), update_frame_info_callback_( base::Bind(&BrowserViewRendererImpl::OnFrameInfoUpdated, - base::Unretained(ALLOW_THIS_IN_INITIALIZER_LIST(this)))), + base::Unretained(this))), prevent_client_invalidate_(false) { DCHECK(java_helper); diff --git a/android_webview/browser/net/android_stream_reader_url_request_job.cc b/android_webview/browser/net/android_stream_reader_url_request_job.cc index c2c4783..de7e5b6 100644 --- a/android_webview/browser/net/android_stream_reader_url_request_job.cc +++ b/android_webview/browser/net/android_stream_reader_url_request_job.cc @@ -90,7 +90,7 @@ AndroidStreamReaderURLRequestJob::AndroidStreamReaderURLRequestJob( scoped_ptr<Delegate> delegate) : URLRequestJob(request, network_delegate), delegate_(delegate.Pass()), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(delegate_); } diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc index b1b53ee..2fd6a88 100644 --- a/android_webview/native/aw_contents.cc +++ b/android_webview/native/aw_contents.cc @@ -122,8 +122,8 @@ AwContents::AwContents(JNIEnv* env, new AwWebContentsDelegate(env, web_contents_delegate)), contents_client_bridge_( new AwContentsClientBridge(env, contents_client_bridge)), - ALLOW_THIS_IN_INITIALIZER_LIST(browser_view_renderer_( - BrowserViewRendererImpl::Create(this, &java_renderer_helper))) { + browser_view_renderer_( + BrowserViewRendererImpl::Create(this, &java_renderer_helper)) { android_webview::AwBrowserDependencyFactory* dependency_factory = android_webview::AwBrowserDependencyFactory::GetInstance(); diff --git a/android_webview/native/aw_quota_manager_bridge_impl.cc b/android_webview/native/aw_quota_manager_bridge_impl.cc index b6bac6c..71ac3eb 100644 --- a/android_webview/native/aw_quota_manager_bridge_impl.cc +++ b/android_webview/native/aw_quota_manager_bridge_impl.cc @@ -157,7 +157,7 @@ jint GetDefaultNativeAwQuotaManagerBridge(JNIEnv* env, jclass clazz) { AwQuotaManagerBridgeImpl::AwQuotaManagerBridgeImpl( AwBrowserContext* browser_context) - : weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + : weak_factory_(this), browser_context_(browser_context) { } |