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

Side by Side Diff: android_webview/lib/main/aw_main_delegate.cc

Issue 1067023005: Null check ContentViewCore::GetJavaObject (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix chromecast build Created 5 years, 8 months 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 #include "android_webview/lib/main/aw_main_delegate.h" 5 #include "android_webview/lib/main/aw_main_delegate.h"
6 6
7 #include "android_webview/browser/aw_content_browser_client.h" 7 #include "android_webview/browser/aw_content_browser_client.h"
8 #include "android_webview/browser/browser_view_renderer.h" 8 #include "android_webview/browser/browser_view_renderer.h"
9 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 9 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
10 #include "android_webview/crash_reporter/aw_microdump_crash_reporter.h" 10 #include "android_webview/crash_reporter/aw_microdump_crash_reporter.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 } 188 }
189 189
190 AwMessagePortService* AwMainDelegate::CreateAwMessagePortService() { 190 AwMessagePortService* AwMainDelegate::CreateAwMessagePortService() {
191 return new AwMessagePortServiceImpl(); 191 return new AwMessagePortServiceImpl();
192 } 192 }
193 193
194 #if defined(VIDEO_HOLE) 194 #if defined(VIDEO_HOLE)
195 content::ExternalVideoSurfaceContainer* 195 content::ExternalVideoSurfaceContainer*
196 AwMainDelegate::CreateExternalVideoSurfaceContainer( 196 AwMainDelegate::CreateExternalVideoSurfaceContainer(
197 content::WebContents* web_contents) { 197 content::WebContents* web_contents) {
198 return new ExternalVideoSurfaceContainerImpl(web_contents); 198 return ExternalVideoSurfaceContainerImpl::Create(web_contents);
199 } 199 }
200 #endif 200 #endif
201 201
202 } // namespace android_webview 202 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698