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

Unified Diff: ui/views_content_client/views_content_client.gyp

Issue 297143009: MacViews: Gets views_examples_with_content_exe compiling on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to master Created 6 years, 7 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
Index: ui/views_content_client/views_content_client.gyp
diff --git a/ui/views_content_client/views_content_client.gyp b/ui/views_content_client/views_content_client.gyp
index 100504b0aa138c95912a28f419778a39ce64fbf1..1773c2af63dfeddfd35ae62637036807e795960b 100644
--- a/ui/views_content_client/views_content_client.gyp
+++ b/ui/views_content_client/views_content_client.gyp
@@ -16,7 +16,6 @@
'../../content/content_shell_and_tests.gyp:content_shell_lib',
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
- '../aura/aura.gyp:aura',
'../base/ui_base.gyp:ui_base',
'../events/events.gyp:events',
'../gfx/gfx.gyp:gfx',
@@ -37,8 +36,25 @@
'views_content_client_export.h',
'views_content_client_main_parts.cc',
'views_content_client_main_parts.h',
+ 'views_content_client_main_parts_aura.cc',
+ 'views_content_client_main_parts_aura.h',
+ 'views_content_client_main_parts_chromeos.cc',
+ 'views_content_client_main_parts_desktop_aura.cc',
+ 'views_content_client_main_parts_mac.mm',
'views_content_main_delegate.cc',
],
+ 'conditions': [
+ ['use_aura==1', {
+ 'dependencies': [
+ '../aura/aura.gyp:aura',
+ ],
+ }], # use_aura==1
+ ['chromeos==1', {
+ 'sources!': [
+ 'views_content_client_main_parts_desktop_aura.cc',
+ ]
+ }], # chromeos==1
+ ],
}, # target_name: views_content_client
],
}
« no previous file with comments | « ui/views_content_client/views_content_browser_client.cc ('k') | ui/views_content_client/views_content_client_main_parts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698