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

Unified Diff: chrome/chrome_browser.gypi

Issue 586913002: Add BookmarkUndoService to Android build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: suspend undo service during sync changes Created 6 years, 3 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 | « chrome/browser/sync/glue/bookmark_model_associator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 71fa84cede358827e653a036aa50544db347a6c2..b47a10f3307badaa704205c1ffb137529ebba81c 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2162,14 +2162,6 @@
'browser/sync/sync_ui_util.h',
'browser/tab_contents/background_contents.cc',
'browser/tab_contents/background_contents.h',
- 'browser/undo/bookmark_undo_service.cc',
- 'browser/undo/bookmark_undo_service_factory.cc',
- 'browser/undo/bookmark_undo_service_factory.h',
- 'browser/undo/bookmark_undo_service.h',
- 'browser/undo/bookmark_undo_utils.cc',
- 'browser/undo/bookmark_undo_utils.h',
- 'browser/undo/undo_manager.cc',
- 'browser/undo/undo_manager.h',
],
# Cross-platform Aura files.
'chrome_browser_aura_sources': [
@@ -2320,6 +2312,16 @@
'browser/supervised_user/supervised_user_url_filter.h',
'browser/supervised_user/supervised_users.h',
],
+ 'chrome_browser_undo_sources': [
+ 'browser/undo/bookmark_undo_service.cc',
+ 'browser/undo/bookmark_undo_service_factory.cc',
+ 'browser/undo/bookmark_undo_service_factory.h',
+ 'browser/undo/bookmark_undo_service.h',
+ 'browser/undo/bookmark_undo_utils.cc',
+ 'browser/undo/bookmark_undo_utils.h',
+ 'browser/undo/undo_manager.cc',
+ 'browser/undo/undo_manager.h',
+ ],
'chrome_browser_webrtc_sources': [
# TODO(brettw) should webrtc_log_list.cc go here?
'browser/media/webrtc_log_uploader.cc',
@@ -2876,6 +2878,10 @@
'../sql/sql.gyp:sql',
'../sync/sync.gyp:sync',
],
+ # sources applied to all configurations
+ 'sources': [
+ '<@(chrome_browser_undo_sources)',
+ ],
'conditions': [
['OS != "ios"', {
'dependencies': [
« no previous file with comments | « chrome/browser/sync/glue/bookmark_model_associator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698