| Index: chrome/chrome_browser.gypi
|
| ===================================================================
|
| --- chrome/chrome_browser.gypi (revision 150400)
|
| +++ chrome/chrome_browser.gypi (working copy)
|
| @@ -1764,12 +1764,20 @@
|
| 'browser/policy/url_blacklist_manager.h',
|
| 'browser/policy/user_cloud_policy_manager.cc',
|
| 'browser/policy/user_cloud_policy_manager.h',
|
| + 'browser/policy/user_cloud_policy_store.cc',
|
| + 'browser/policy/user_cloud_policy_store.h',
|
| + 'browser/policy/user_cloud_policy_store_base.cc',
|
| + 'browser/policy/user_cloud_policy_store_base.h',
|
| 'browser/policy/user_cloud_policy_store_chromeos.cc',
|
| 'browser/policy/user_cloud_policy_store_chromeos.h',
|
| 'browser/policy/user_policy_cache.cc',
|
| 'browser/policy/user_policy_cache.h',
|
| 'browser/policy/user_policy_disk_cache.cc',
|
| 'browser/policy/user_policy_disk_cache.h',
|
| + 'browser/policy/user_policy_signin_service.cc',
|
| + 'browser/policy/user_policy_signin_service.h',
|
| + 'browser/policy/user_policy_signin_service_factory.cc',
|
| + 'browser/policy/user_policy_signin_service_factory.h',
|
| 'browser/policy/user_policy_token_cache.cc',
|
| 'browser/policy/user_policy_token_cache.h',
|
| 'browser/predictors/autocomplete_action_predictor.cc',
|
| @@ -4615,6 +4623,12 @@
|
| ['exclude', 'browser/password_manager/native_backend_gnome_x.h'],
|
| ['exclude', 'browser/password_manager/native_backend_kwallet_x.cc'],
|
| ['exclude', 'browser/password_manager/native_backend_kwallet_x.h'],
|
| + ['exclude', 'browser/policy/user_cloud_policy_store.cc'],
|
| + ['exclude', 'browser/policy/user_cloud_policy_store.h'],
|
| + ['exclude', 'browser/policy/user_policy_signin_service.cc'],
|
| + ['exclude', 'browser/policy/user_policy_signin_service.h'],
|
| + ['exclude', 'browser/policy/user_policy_signin_service_factory.cc'],
|
| + ['exclude', 'browser/policy/user_policy_signin_service_factory.h'],
|
| ['exclude', 'browser/platform_util_linux.cc'],
|
| ['exclude', 'browser/speech/extension_api/tts_extension_api_linux.cc'],
|
| ['exclude', 'browser/ui/webui/help/version_updater_basic.cc'],
|
|
|
| Property changes on: chrome\chrome_browser.gypi
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|