| Index: components/bookmarks.gypi
|
| diff --git a/components/bookmarks.gypi b/components/bookmarks.gypi
|
| index 9bcc08fea821c6b984788e8a5d62582ce2f60970..cef049fbb5344d130247e179514ad7b3181d0632 100644
|
| --- a/components/bookmarks.gypi
|
| +++ b/components/bookmarks.gypi
|
| @@ -5,7 +5,7 @@
|
| {
|
| 'targets': [
|
| {
|
| - 'target_name': 'bookmarks_core_browser',
|
| + 'target_name': 'bookmarks_browser',
|
| 'type': 'static_library',
|
| 'include_dirs': [
|
| '..',
|
| @@ -17,7 +17,7 @@
|
| '../ui/base/ui_base.gyp:ui_base',
|
| '../ui/gfx/gfx.gyp:gfx',
|
| '../url/url.gyp:url_lib',
|
| - 'bookmarks_core_common',
|
| + 'bookmarks_common',
|
| 'components_strings.gyp:components_strings',
|
| 'favicon_base',
|
| 'query_parser',
|
| @@ -25,41 +25,41 @@
|
| 'pref_registry',
|
| ],
|
| 'sources': [
|
| - 'bookmarks/core/browser/base_bookmark_model_observer.cc',
|
| - 'bookmarks/core/browser/base_bookmark_model_observer.h',
|
| - 'bookmarks/core/browser/bookmark_client.cc',
|
| - 'bookmarks/core/browser/bookmark_client.h',
|
| - 'bookmarks/core/browser/bookmark_codec.cc',
|
| - 'bookmarks/core/browser/bookmark_codec.h',
|
| - 'bookmarks/core/browser/bookmark_expanded_state_tracker.cc',
|
| - 'bookmarks/core/browser/bookmark_expanded_state_tracker.h',
|
| - 'bookmarks/core/browser/bookmark_index.cc',
|
| - 'bookmarks/core/browser/bookmark_index.h',
|
| - 'bookmarks/core/browser/bookmark_match.cc',
|
| - 'bookmarks/core/browser/bookmark_match.h',
|
| - 'bookmarks/core/browser/bookmark_model.cc',
|
| - 'bookmarks/core/browser/bookmark_model.h',
|
| - 'bookmarks/core/browser/bookmark_model_observer.h',
|
| - 'bookmarks/core/browser/bookmark_node.cc',
|
| - 'bookmarks/core/browser/bookmark_node.h',
|
| - 'bookmarks/core/browser/bookmark_node_data.cc',
|
| - 'bookmarks/core/browser/bookmark_node_data.h',
|
| - 'bookmarks/core/browser/bookmark_node_data_ios.cc',
|
| - 'bookmarks/core/browser/bookmark_node_data_mac.cc',
|
| - 'bookmarks/core/browser/bookmark_node_data_views.cc',
|
| - 'bookmarks/core/browser/bookmark_pasteboard_helper_mac.h',
|
| - 'bookmarks/core/browser/bookmark_pasteboard_helper_mac.mm',
|
| - 'bookmarks/core/browser/bookmark_service.h',
|
| - 'bookmarks/core/browser/bookmark_storage.cc',
|
| - 'bookmarks/core/browser/bookmark_storage.h',
|
| - 'bookmarks/core/browser/bookmark_utils.cc',
|
| - 'bookmarks/core/browser/bookmark_utils.h',
|
| - 'bookmarks/core/browser/scoped_group_bookmark_actions.cc',
|
| - 'bookmarks/core/browser/scoped_group_bookmark_actions.h',
|
| + 'bookmarks/browser/base_bookmark_model_observer.cc',
|
| + 'bookmarks/browser/base_bookmark_model_observer.h',
|
| + 'bookmarks/browser/bookmark_client.cc',
|
| + 'bookmarks/browser/bookmark_client.h',
|
| + 'bookmarks/browser/bookmark_codec.cc',
|
| + 'bookmarks/browser/bookmark_codec.h',
|
| + 'bookmarks/browser/bookmark_expanded_state_tracker.cc',
|
| + 'bookmarks/browser/bookmark_expanded_state_tracker.h',
|
| + 'bookmarks/browser/bookmark_index.cc',
|
| + 'bookmarks/browser/bookmark_index.h',
|
| + 'bookmarks/browser/bookmark_match.cc',
|
| + 'bookmarks/browser/bookmark_match.h',
|
| + 'bookmarks/browser/bookmark_model.cc',
|
| + 'bookmarks/browser/bookmark_model.h',
|
| + 'bookmarks/browser/bookmark_model_observer.h',
|
| + 'bookmarks/browser/bookmark_node.cc',
|
| + 'bookmarks/browser/bookmark_node.h',
|
| + 'bookmarks/browser/bookmark_node_data.cc',
|
| + 'bookmarks/browser/bookmark_node_data.h',
|
| + 'bookmarks/browser/bookmark_node_data_ios.cc',
|
| + 'bookmarks/browser/bookmark_node_data_mac.cc',
|
| + 'bookmarks/browser/bookmark_node_data_views.cc',
|
| + 'bookmarks/browser/bookmark_pasteboard_helper_mac.h',
|
| + 'bookmarks/browser/bookmark_pasteboard_helper_mac.mm',
|
| + 'bookmarks/browser/bookmark_service.h',
|
| + 'bookmarks/browser/bookmark_storage.cc',
|
| + 'bookmarks/browser/bookmark_storage.h',
|
| + 'bookmarks/browser/bookmark_utils.cc',
|
| + 'bookmarks/browser/bookmark_utils.h',
|
| + 'bookmarks/browser/scoped_group_bookmark_actions.cc',
|
| + 'bookmarks/browser/scoped_group_bookmark_actions.h',
|
| ],
|
| },
|
| {
|
| - 'target_name': 'bookmarks_core_common',
|
| + 'target_name': 'bookmarks_common',
|
| 'type': 'static_library',
|
| 'include_dirs': [
|
| '..',
|
| @@ -68,14 +68,14 @@
|
| '../base/base.gyp:base',
|
| ],
|
| 'sources': [
|
| - 'bookmarks/core/common/bookmark_constants.cc',
|
| - 'bookmarks/core/common/bookmark_constants.h',
|
| - 'bookmarks/core/common/bookmark_pref_names.cc',
|
| - 'bookmarks/core/common/bookmark_pref_names.h',
|
| + 'bookmarks/common/bookmark_constants.cc',
|
| + 'bookmarks/common/bookmark_constants.h',
|
| + 'bookmarks/common/bookmark_pref_names.cc',
|
| + 'bookmarks/common/bookmark_pref_names.h',
|
| ],
|
| },
|
| {
|
| - 'target_name': 'bookmarks_core_test_support',
|
| + 'target_name': 'bookmarks_test_support',
|
| 'type': 'static_library',
|
| 'include_dirs': [
|
| '..',
|
| @@ -84,13 +84,13 @@
|
| '../base/base.gyp:base',
|
| '../ui/events/platform/events_platform.gyp:events_platform',
|
| '../url/url.gyp:url_lib',
|
| - 'bookmarks_core_browser',
|
| + 'bookmarks_browser',
|
| ],
|
| 'sources': [
|
| - 'bookmarks/core/test/bookmark_test_helpers.cc',
|
| - 'bookmarks/core/test/bookmark_test_helpers.h',
|
| - 'bookmarks/core/test/test_bookmark_client.cc',
|
| - 'bookmarks/core/test/test_bookmark_client.h',
|
| + 'bookmarks/test/bookmark_test_helpers.cc',
|
| + 'bookmarks/test/bookmark_test_helpers.h',
|
| + 'bookmarks/test/test_bookmark_client.cc',
|
| + 'bookmarks/test/test_bookmark_client.h',
|
| ],
|
| 'conditions': [
|
| ['use_x11==1', {
|
|
|