diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-07-01 14:26:10 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-07-01 14:26:10 +0100 |
| commit | 2f22f038970e0d1927c41b04bbf5589bd12c5316 (patch) | |
| tree | 15ae69a6496c31f7a00fed54dd22af04dcc8fb81 /android_webview/native/webview_native.target.darwin-x86_64.mk | |
| parent | 770300fb3fec927eb702b146c92281093e917c72 (diff) | |
| download | chromium_org-2f22f038970e0d1927c41b04bbf5589bd12c5316.tar.gz | |
Merge from Chromium at DEPS revision 37.0.2062.10
This commit was generated by merge_to_master.py.
Change-Id: I7a3a1838fe1d01e3d29886fc52aa980c2c3f2783
Diffstat (limited to 'android_webview/native/webview_native.target.darwin-x86_64.mk')
| -rw-r--r-- | android_webview/native/webview_native.target.darwin-x86_64.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/native/webview_native.target.darwin-x86_64.mk b/android_webview/native/webview_native.target.darwin-x86_64.mk index 2ddc736158..63240ab30d 100644 --- a/android_webview/native/webview_native.target.darwin-x86_64.mk +++ b/android_webview/native/webview_native.target.darwin-x86_64.mk @@ -57,7 +57,7 @@ LOCAL_SRC_FILES := \ android_webview/native/permission/media_access_permission_request.cc \ android_webview/native/permission/permission_request_handler.cc \ android_webview/native/permission/permission_request_handler_client.cc \ - android_webview/native/permission/protected_media_id_permission_request.cc \ + android_webview/native/permission/simple_permission_request.cc \ android_webview/native/state_serializer.cc \ android_webview/native/external_video_surface_container_impl.cc |