| Index: chrome/chrome_browser_extensions.gypi
|
| ===================================================================
|
| --- chrome/chrome_browser_extensions.gypi (revision 176052)
|
| +++ chrome/chrome_browser_extensions.gypi (working copy)
|
| @@ -97,14 +97,14 @@
|
| 'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h',
|
| 'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_constants.cc',
|
| 'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_constants.h',
|
| + 'browser/extensions/api/bookmarks/bookmark_api.cc',
|
| + 'browser/extensions/api/bookmarks/bookmark_api.h',
|
| 'browser/extensions/api/bookmarks/bookmark_api_constants.cc',
|
| 'browser/extensions/api/bookmarks/bookmark_api_constants.h',
|
| 'browser/extensions/api/bookmarks/bookmark_api_factory.cc',
|
| 'browser/extensions/api/bookmarks/bookmark_api_factory.h',
|
| 'browser/extensions/api/bookmarks/bookmark_api_helpers.cc',
|
| 'browser/extensions/api/bookmarks/bookmark_api_helpers.h',
|
| - 'browser/extensions/api/bookmarks/bookmarks_api.cc',
|
| - 'browser/extensions/api/bookmarks/bookmarks_api.h',
|
| 'browser/extensions/api/browsing_data/browsing_data_api.cc',
|
| 'browser/extensions/api/browsing_data/browsing_data_api.h',
|
| 'browser/extensions/api/cloud_print_private/cloud_print_private_api.cc',
|
| @@ -123,8 +123,8 @@
|
| 'browser/extensions/api/content_settings/content_settings_store.h',
|
| 'browser/extensions/api/commands/commands.cc',
|
| 'browser/extensions/api/commands/commands.h',
|
| - 'browser/extensions/api/context_menus/context_menus_api.cc',
|
| - 'browser/extensions/api/context_menus/context_menus_api.h',
|
| + 'browser/extensions/api/context_menu/context_menu_api.cc',
|
| + 'browser/extensions/api/context_menu/context_menu_api.h',
|
| 'browser/extensions/api/cookies/cookies_api.cc',
|
| 'browser/extensions/api/cookies/cookies_api.h',
|
| 'browser/extensions/api/cookies/cookies_api_constants.cc',
|
| @@ -324,38 +324,6 @@
|
| 'browser/extensions/api/socket/tcp_socket.h',
|
| 'browser/extensions/api/socket/udp_socket.cc',
|
| 'browser/extensions/api/socket/udp_socket.h',
|
| - 'browser/extensions/api/storage/leveldb_settings_storage_factory.cc',
|
| - 'browser/extensions/api/storage/leveldb_settings_storage_factory.h',
|
| - 'browser/extensions/api/storage/managed_value_store_cache.cc',
|
| - 'browser/extensions/api/storage/managed_value_store_cache.h',
|
| - 'browser/extensions/api/storage/policy_value_store.cc',
|
| - 'browser/extensions/api/storage/policy_value_store.h',
|
| - 'browser/extensions/api/storage/setting_sync_data.cc',
|
| - 'browser/extensions/api/storage/setting_sync_data.h',
|
| - 'browser/extensions/api/storage/settings_backend.cc',
|
| - 'browser/extensions/api/storage/settings_backend.h',
|
| - 'browser/extensions/api/storage/settings_frontend.cc',
|
| - 'browser/extensions/api/storage/settings_frontend.h',
|
| - 'browser/extensions/api/storage/settings_namespace.cc',
|
| - 'browser/extensions/api/storage/settings_namespace.h',
|
| - 'browser/extensions/api/storage/settings_observer.h',
|
| - 'browser/extensions/api/storage/settings_storage_factory.h',
|
| - 'browser/extensions/api/storage/settings_storage_quota_enforcer.cc',
|
| - 'browser/extensions/api/storage/settings_storage_quota_enforcer.h',
|
| - 'browser/extensions/api/storage/settings_sync_processor.cc',
|
| - 'browser/extensions/api/storage/settings_sync_processor.h',
|
| - 'browser/extensions/api/storage/settings_sync_util.cc',
|
| - 'browser/extensions/api/storage/settings_sync_util.h',
|
| - 'browser/extensions/api/storage/storage_api.cc',
|
| - 'browser/extensions/api/storage/storage_api.h',
|
| - 'browser/extensions/api/storage/sync_or_local_value_store_cache.cc',
|
| - 'browser/extensions/api/storage/sync_or_local_value_store_cache.h',
|
| - 'browser/extensions/api/storage/syncable_settings_storage.cc',
|
| - 'browser/extensions/api/storage/syncable_settings_storage.h',
|
| - 'browser/extensions/api/storage/value_store_cache.cc',
|
| - 'browser/extensions/api/storage/value_store_cache.h',
|
| - 'browser/extensions/api/storage/weak_unlimited_settings_storage.cc',
|
| - 'browser/extensions/api/storage/weak_unlimited_settings_storage.h',
|
| 'browser/extensions/api/sync_file_system/extension_sync_event_observer_factory.cc',
|
| 'browser/extensions/api/sync_file_system/extension_sync_event_observer_factory.h',
|
| 'browser/extensions/api/sync_file_system/extension_sync_event_observer.cc',
|
| @@ -399,8 +367,10 @@
|
| 'browser/extensions/api/tab_capture/tab_capture_registry.h',
|
| 'browser/extensions/api/tab_capture/tab_capture_registry_factory.cc',
|
| 'browser/extensions/api/tab_capture/tab_capture_registry_factory.h',
|
| - 'browser/extensions/api/tabs/tabs_api.cc',
|
| - 'browser/extensions/api/tabs/tabs_api.h',
|
| + 'browser/extensions/api/tabs/execute_code_in_tab_function.cc',
|
| + 'browser/extensions/api/tabs/execute_code_in_tab_function.h',
|
| + 'browser/extensions/api/tabs/tabs.cc',
|
| + 'browser/extensions/api/tabs/tabs.h',
|
| 'browser/extensions/api/tabs/tabs_windows_api.cc',
|
| 'browser/extensions/api/tabs/tabs_windows_api.h',
|
| 'browser/extensions/api/tabs/tabs_constants.cc',
|
| @@ -666,6 +636,38 @@
|
| 'browser/extensions/script_bubble_controller.h',
|
| 'browser/extensions/script_executor.cc',
|
| 'browser/extensions/script_executor.h',
|
| + 'browser/extensions/settings/leveldb_settings_storage_factory.cc',
|
| + 'browser/extensions/settings/leveldb_settings_storage_factory.h',
|
| + 'browser/extensions/settings/managed_value_store_cache.cc',
|
| + 'browser/extensions/settings/managed_value_store_cache.h',
|
| + 'browser/extensions/settings/policy_value_store.cc',
|
| + 'browser/extensions/settings/policy_value_store.h',
|
| + 'browser/extensions/settings/setting_sync_data.cc',
|
| + 'browser/extensions/settings/setting_sync_data.h',
|
| + 'browser/extensions/settings/settings_api.cc',
|
| + 'browser/extensions/settings/settings_api.h',
|
| + 'browser/extensions/settings/settings_backend.cc',
|
| + 'browser/extensions/settings/settings_backend.h',
|
| + 'browser/extensions/settings/settings_frontend.cc',
|
| + 'browser/extensions/settings/settings_frontend.h',
|
| + 'browser/extensions/settings/settings_namespace.cc',
|
| + 'browser/extensions/settings/settings_namespace.h',
|
| + 'browser/extensions/settings/settings_observer.h',
|
| + 'browser/extensions/settings/settings_storage_factory.h',
|
| + 'browser/extensions/settings/settings_storage_quota_enforcer.cc',
|
| + 'browser/extensions/settings/settings_storage_quota_enforcer.h',
|
| + 'browser/extensions/settings/settings_sync_processor.cc',
|
| + 'browser/extensions/settings/settings_sync_processor.h',
|
| + 'browser/extensions/settings/settings_sync_util.cc',
|
| + 'browser/extensions/settings/settings_sync_util.h',
|
| + 'browser/extensions/settings/sync_or_local_value_store_cache.cc',
|
| + 'browser/extensions/settings/sync_or_local_value_store_cache.h',
|
| + 'browser/extensions/settings/syncable_settings_storage.cc',
|
| + 'browser/extensions/settings/syncable_settings_storage.h',
|
| + 'browser/extensions/settings/value_store_cache.cc',
|
| + 'browser/extensions/settings/value_store_cache.h',
|
| + 'browser/extensions/settings/weak_unlimited_settings_storage.cc',
|
| + 'browser/extensions/settings/weak_unlimited_settings_storage.h',
|
| 'browser/extensions/shell_window_geometry_cache.cc',
|
| 'browser/extensions/shell_window_geometry_cache.h',
|
| 'browser/extensions/shell_window_registry.cc',
|
| @@ -784,7 +786,6 @@
|
| ['include', '^browser/extensions/api/proxy/proxy_api_constants.cc'],
|
| ['include', '^browser/extensions/api/push_messaging/push_messaging_api.cc'],
|
| ['include', '^browser/extensions/api/runtime/runtime_api.cc'],
|
| - ['include', '^browser/extensions/api/storage/.*\.cc'],
|
| ['include', '^browser/extensions/api/system_info_cpu/cpu_info_provider.cc'],
|
| ['include', '^browser/extensions/api/system_info_cpu/cpu_info_provider_android.cc'],
|
| ['include', '^browser/extensions/api/tabs/tabs_constants.cc'],
|
| @@ -831,10 +832,10 @@
|
| ],
|
| }, { # configuration_policy==0
|
| 'sources!': [
|
| - 'browser/extensions/api/storage/managed_value_store_cache.cc',
|
| - 'browser/extensions/api/storage/managed_value_store_cache.h',
|
| - 'browser/extensions/api/storage/policy_value_store.cc',
|
| - 'browser/extensions/api/storage/policy_value_store.h',
|
| + 'browser/extensions/settings/managed_value_store_cache.cc',
|
| + 'browser/extensions/settings/managed_value_store_cache.h',
|
| + 'browser/extensions/settings/policy_value_store.cc',
|
| + 'browser/extensions/settings/policy_value_store.h',
|
| ],
|
| }],
|
| ['OS=="win"', {
|
|
|