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

Unified Diff: ui/base/ui_base.gyp

Issue 312393002: ozone: Move the factory interfaces into a common target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-r278697 Created 6 years, 6 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 | « ui/base/cursor/ozone/cursor_factory_ozone.cc ('k') | ui/events/ozone/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ui_base.gyp
diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
index 43ed1508075cf84456307fbe2560f070749afd5f..e5ddcd77aead4df6ac93674774ccd5d49d651384 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -136,8 +136,6 @@
'cursor/image_cursors.h',
'cursor/ozone/bitmap_cursor_factory_ozone.cc',
'cursor/ozone/bitmap_cursor_factory_ozone.h',
- 'cursor/ozone/cursor_factory_ozone.cc',
- 'cursor/ozone/cursor_factory_ozone.h',
'default_theme_provider.cc',
'default_theme_provider.h',
'default_theme_provider_mac.mm',
@@ -373,6 +371,11 @@
'resource/resource_bundle_auralinux.cc',
],
}],
+ ['use_ozone==1', {
+ 'dependencies': [
+ '../ozone/ozone.gyp:ozone_base',
+ ],
+ }],
['use_aura==1 and OS=="win"', {
'sources/': [
['exclude', 'dragdrop/drag_utils_aura.cc'],
« no previous file with comments | « ui/base/cursor/ozone/cursor_factory_ozone.cc ('k') | ui/events/ozone/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698