diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
| commit | 4e180b6a0b4720a9b8e9e959a882386f690f08ff (patch) | |
| tree | 788435d09362885908ba5ba9ef868b852ca82c0b /android_webview/android_webview.gyp | |
| parent | 1179b92b08db0c652a0cf003ab4d89b31ce3610f (diff) | |
| download | chromium_org-4e180b6a0b4720a9b8e9e959a882386f690f08ff.tar.gz | |
Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index eea495ecaf..824e610cb0 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -125,15 +125,17 @@ 'browser/aw_javascript_dialog_manager.h', 'browser/aw_login_delegate.cc', 'browser/aw_login_delegate.h', + 'browser/aw_pref_store.cc', + 'browser/aw_pref_store.h', 'browser/aw_quota_manager_bridge.cc', 'browser/aw_quota_manager_bridge.h', 'browser/aw_quota_permission_context.cc', 'browser/aw_quota_permission_context.h', - 'browser/aw_pref_store.cc', - 'browser/aw_pref_store.h', 'browser/aw_request_interceptor.cc', 'browser/aw_request_interceptor.h', 'browser/aw_result_codes.h', + 'browser/aw_web_preferences_populater.cc', + 'browser/aw_web_preferences_populater.h', 'browser/browser_view_renderer.h', 'browser/find_helper.cc', 'browser/find_helper.h', |