diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 20:46:52 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 20:46:52 +0000 |
| commit | 042ba8592ac73507fda0135d977b63347b77b873 (patch) | |
| tree | 1472630f6960ec5ee2214bd11f33939f7282a70a /ppapi/ppapi_shared.gypi | |
| parent | 7e1dc3d25fb9211ae4baf7577ef72afcad78f2e1 (diff) | |
| download | chromium_src-042ba8592ac73507fda0135d977b63347b77b873.zip chromium_src-042ba8592ac73507fda0135d977b63347b77b873.tar.gz chromium_src-042ba8592ac73507fda0135d977b63347b77b873.tar.bz2 | |
Revert 140093 - Open pepper files directly in browser.
This CL merges in the changes for the per-profile plugin process from the
previously retired CL.
Review URL: https://chromiumcodereview.appspot.com/10387195
TBR=tsepez@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10477006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_shared.gypi')
| -rw-r--r-- | ppapi/ppapi_shared.gypi | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi index 5afcefe..d9d0140 100644 --- a/ppapi/ppapi_shared.gypi +++ b/ppapi/ppapi_shared.gypi @@ -41,7 +41,7 @@ ], 'export_dependent_settings': [ '../base/base.gyp:base', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', + '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'conditions': [ ['OS=="mac"', { @@ -57,8 +57,6 @@ 'shared_impl/array_writer.h', 'shared_impl/callback_tracker.cc', 'shared_impl/callback_tracker.h', - 'shared_impl/file_path.cc', - 'shared_impl/file_path.h', 'shared_impl/file_type_conversion.cc', 'shared_impl/file_type_conversion.h', 'shared_impl/host_resource.h', |