diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/android_webview | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/android_webview')
| -rw-r--r-- | chromium/android_webview/all_webview.gyp | 1 | ||||
| -rw-r--r-- | chromium/android_webview/android_webview.gyp | 2 | ||||
| -rw-r--r-- | chromium/android_webview/native/webview_native.gyp | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/chromium/android_webview/all_webview.gyp b/chromium/android_webview/all_webview.gyp index e3e3fea5eb8..bd46f26fb7e 100644 --- a/chromium/android_webview/all_webview.gyp +++ b/chromium/android_webview/all_webview.gyp @@ -20,6 +20,7 @@ '../content/content.gyp:page_transition_types_java', '../content/content.gyp:result_codes_java', '../content/content.gyp:speech_recognition_error_java', + '../media/media.gyp:media_android_imageformat_list', '../net/net.gyp:certificate_mime_types_java', '../net/net.gyp:cert_verify_result_android_java', '../net/net.gyp:net_errors_java', diff --git a/chromium/android_webview/android_webview.gyp b/chromium/android_webview/android_webview.gyp index d687e717598..eea495ecafe 100644 --- a/chromium/android_webview/android_webview.gyp +++ b/chromium/android_webview/android_webview.gyp @@ -113,8 +113,6 @@ 'browser/aw_contents_io_thread_client.h', 'browser/aw_cookie_access_policy.cc', 'browser/aw_cookie_access_policy.h', - 'browser/aw_devtools_delegate.cc', - 'browser/aw_devtools_delegate.h', 'browser/aw_download_manager_delegate.cc', 'browser/aw_download_manager_delegate.h', 'browser/aw_form_database_service.cc', diff --git a/chromium/android_webview/native/webview_native.gyp b/chromium/android_webview/native/webview_native.gyp index b1d7082f206..1e1d5f85073 100644 --- a/chromium/android_webview/native/webview_native.gyp +++ b/chromium/android_webview/native/webview_native.gyp @@ -44,6 +44,8 @@ 'aw_contents_client_bridge.h', 'aw_contents_io_thread_client_impl.cc', 'aw_contents_io_thread_client_impl.h', + 'aw_dev_tools_server.cc', + 'aw_dev_tools_server.h', 'aw_form_database.cc', 'aw_form_database.h', 'aw_geolocation_permission_context.cc', @@ -94,6 +96,7 @@ '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', + '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPicture.java', |