projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
ui
/
message_center
/
message_center.gyp
diff --git
a/src/ui/message_center/message_center.gyp
b/src/ui/message_center/message_center.gyp
index
d163ee4
..
eb956aa
100644
(file)
--- a/
src/ui/message_center/message_center.gyp
+++ b/
src/ui/message_center/message_center.gyp
@@
-57,6
+57,8
@@
'message_center_observer.h',
'message_center_style.cc',
'message_center_style.h',
'message_center_observer.h',
'message_center_style.cc',
'message_center_style.h',
+ 'message_center_switches.cc',
+ 'message_center_switches.h',
'message_center_tray.cc',
'message_center_tray.h',
'message_center_tray_delegate.h',
'message_center_tray.cc',
'message_center_tray.h',
'message_center_tray_delegate.h',
@@
-117,7
+119,9
@@
'../aura/aura.gyp:aura',
],
}],
'../aura/aura.gyp:aura',
],
}],
- ['toolkit_views==1', {
+ # On Mac, toolkit-views builds still use the Cocoa UI. Keep this in sync
+ # with message_center_unittests below.
+ ['toolkit_views==1 and OS!="mac"', {
'dependencies': [
'../events/events.gyp:events',
'../views/views.gyp:views',
'dependencies': [
'../events/events.gyp:events',
'../views/views.gyp:views',
@@
-219,7
+223,7
@@
'../gfx/gfx.gyp:gfx_test_support',
],
}],
'../gfx/gfx.gyp:gfx_test_support',
],
}],
- ['toolkit_views==1', {
+ ['toolkit_views==1
and OS!="mac"
', {
'dependencies': [
# Compositor is needed by message_center_view_unittest.cc
# and for the fonts used by bounded_label_unittest.cc.
'dependencies': [
# Compositor is needed by message_center_view_unittest.cc
# and for the fonts used by bounded_label_unittest.cc.