Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(597)

Unified Diff: components/sessions.gypi

Issue 14497003: Moves TabNavigation into components/sessions and renames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Really remove webkit_support Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/components_tests.gypi ('k') | components/sessions/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sessions.gypi
diff --git a/components/user_prefs.gypi b/components/sessions.gypi
similarity index 31%
copy from components/user_prefs.gypi
copy to components/sessions.gypi
index a556e708ce3366131aef71bfb7576215feb66e8a..d8820b89e30c8f8aeba102d0b81bb0e4fda831e9 100644
--- a/components/user_prefs.gypi
+++ b/components/sessions.gypi
@@ -5,27 +5,49 @@
{
'targets': [
{
- 'target_name': 'user_prefs',
+ 'target_name': 'sessions',
'type': '<(component)',
'dependencies': [
'../base/base.gyp:base',
- '../base/base.gyp:base_prefs',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
'../content/content.gyp:content_browser',
- '../ui/ui.gyp:ui',
+ '../skia/skia.gyp:skia',
+ '../sync/sync.gyp:sync',
+ '../third_party/protobuf/protobuf.gyp:protobuf_lite',
],
'include_dirs': [
'..',
],
'defines': [
- 'USER_PREFS_IMPLEMENTATION',
+ 'SESSIONS_IMPLEMENTATION',
],
'sources': [
- 'user_prefs/pref_registry_syncable.cc',
- 'user_prefs/pref_registry_syncable.h',
- 'user_prefs/user_prefs.cc',
- 'user_prefs/user_prefs.h',
- 'user_prefs/user_prefs_export.h',
+ 'sessions/serialized_navigation_entry.cc',
+ 'sessions/serialized_navigation_entry.h',
+ ],
+ 'conditions': [
+ ['OS != "ios"', {
+ 'dependencies': [
+ '../webkit/support/webkit_support.gyp:glue',
+ ]
+ }],
+ ],
+ },
+ {
+ 'target_name': 'sessions_test_support',
+ 'type': 'static_library',
+ 'defines!': ['SESSIONS_IMPLEMENTATION'],
+ 'dependencies': [
+ '../skia/skia.gyp:skia',
+ '../sync/sync.gyp:sync',
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'sources': [
+ 'sessions/serialized_navigation_entry_test_helper.cc',
+ 'sessions/serialized_navigation_entry_test_helper.h',
],
},
],
« no previous file with comments | « components/components_tests.gypi ('k') | components/sessions/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698