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

Unified Diff: ui/views/views.gyp

Issue 927233003: MacViews: Fix positioning of top-level Widgets with parents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150129-MacViews-Bringup5
Patch Set: Added comment to BridgedNativeWidget Created 5 years, 10 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/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index c1a98babbf374b961f1831dd8bd2e7078b886e04..9e7b3b8e0de63e7611fbaac543455308def7b46d 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -548,7 +548,6 @@
'event_monitor_unittest.cc',
'focus/focus_manager_unittest.cc',
'focus/focus_traversal_unittest.cc',
- 'ime/input_method_bridge_unittest.cc',
'layout/box_layout_unittest.cc',
'layout/grid_layout_unittest.cc',
'rect_based_targeting_utils_unittest.cc',
@@ -568,6 +567,10 @@
'window/dialog_client_view_unittest.cc',
'window/dialog_delegate_unittest.cc',
],
+ 'views_unittests_desktop_sources': [
+ 'ime/input_method_bridge_unittest.cc',
+ 'widget/desktop_widget_unittest.cc',
+ ],
'views_unittests_aura_sources': [
'corewm/tooltip_aura_unittest.cc',
'corewm/tooltip_controller_unittest.cc',
@@ -576,7 +579,6 @@
'views_unittests_desktop_aura_sources': [
'widget/desktop_aura/desktop_focus_rules_unittest.cc',
'widget/desktop_aura/desktop_native_widget_aura_unittest.cc',
- 'widget/desktop_aura/desktop_screen_position_client_unittest.cc',
],
'views_unittests_desktop_aurax11_sources': [
'widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc',
@@ -800,11 +802,6 @@
'<@(views_unittests_sources)',
],
'conditions': [
- ['chromeos==1', {
- 'sources!': [
- 'ime/input_method_bridge_unittest.cc',
- ],
- }],
['OS=="win"', {
'dependencies': [
'../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
@@ -862,6 +859,9 @@
}],
]
}],
+ ['chromeos==0', {
+ 'sources': [ '<@(views_unittests_desktop_sources)' ],
+ }],
['use_x11==1', {
'dependencies': [
'../events/platform/x11/x11_events_platform.gyp:x11_events_platform',

Powered by Google App Engine
This is Rietveld 408576698