Index: chrome/browser/ui/BUILD.gn |
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn |
index 97baa3b5f8799f33c931caa394f94fbd26813f7f..9579c750feb6b7d8868194770103f107b5db5581 100644 |
--- a/chrome/browser/ui/BUILD.gn |
+++ b/chrome/browser/ui/BUILD.gn |
@@ -1803,10 +1803,6 @@ split_static_library("ui") { |
"views/tabs/tab_strip_controller.h", |
"views/tabs/tab_strip_layout.cc", |
"views/tabs/tab_strip_layout.h", |
- "views/tabs/window_finder.cc", |
- "views/tabs/window_finder.h", |
- "views/tabs/window_finder_chromeos.cc", |
- "views/tabs/window_finder_win.cc", |
"views/theme_copying_widget.cc", |
"views/theme_copying_widget.h", |
"views/toolbar/app_menu.cc", |
@@ -1852,17 +1848,6 @@ split_static_library("ui") { |
"//services/ui/public/interfaces", |
] |
} |
- |
- # TODO(ellyjones): Mus is not supported on Mac (there is no ui::Window |
- # apart from aura::Window, which is also not supported). |
- if (!is_mac) { |
- sources += [ |
- "views/tabs/window_finder_mus.cc", |
- "views/tabs/window_finder_mus.h", |
- ] |
- |
- deps += [ "//ui/views/mus" ] |
- } |
} |
if (use_ash) { |
sources += [ |
@@ -1880,7 +1865,6 @@ split_static_library("ui") { |
"views/frame/immersive_mode_controller_ash.h", |
"views/frame/web_app_left_header_view_ash.cc", |
"views/frame/web_app_left_header_view_ash.h", |
- "views/tabs/window_finder_ash.cc", |
] |
} |
} |
@@ -2351,7 +2335,6 @@ split_static_library("ui") { |
"views/frame/browser_non_client_frame_view_mac.mm", |
"views/frame/native_browser_frame_factory_mac.mm", |
"views/infobars/legacy_infobars_mac.cc", |
- "views/tabs/window_finder_mac.mm", |
] |
deps += [ "//extensions/components/native_app_window" ] |
} else { |
@@ -3045,19 +3028,52 @@ split_static_library("ui") { |
sources += [ |
"views/javascript_app_modal_event_blocker_x11.cc", |
"views/javascript_app_modal_event_blocker_x11.h", |
- "views/tabs/window_finder_x11.cc", |
] |
configs += [ "//build/config/linux:x11" ] |
deps += [ |
"//ui/events/devices", |
"//ui/events/devices/x11", |
] |
- if (is_chromeos) { |
- sources -= [ "views/tabs/window_finder_x11.cc" ] |
- } |
} |
} |
+ # Group window_finder* pick up logic as following: |
+ # - Mus is not support on Mac, so skip window_finder_mus.cc. |
fwang
2016/10/31 11:46:06
*supported*
tonikitoo
2016/10/31 14:20:29
Done locally. will reupload with further review re
|
+ # - Other platforms (except Android) build window_finder.h/cc as well |
+ # as a platform specific associated file, window_finder_{win,chromeos,etc}. |
+ if (toolkit_views) { |
+ if (!is_mac) { |
+ sources += [ |
+ "views/tabs/window_finder.cc", |
+ "views/tabs/window_finder.h", |
+ |
+ # TODO(ellyjones): Mus is not supported on Mac (there is no ui::Window |
+ # apart from aura::Window, which is also not supported). |
+ "views/tabs/window_finder_mus.cc", |
+ "views/tabs/window_finder_mus.h", |
+ ] |
+ deps += [ "//ui/views/mus" ] |
+ } |
+ if (is_chromeos) { |
+ sources += [ "views/tabs/window_finder_chromeos.cc" ] |
+ } |
+ if (is_win) { |
+ sources += [ "views/tabs/window_finder_win.cc" ] |
+ } |
+ if (is_desktop_linux && use_x11) { |
+ sources += [ "views/tabs/window_finder_x11.cc" ] |
+ } |
+ if (use_ash) { |
+ sources += [ "views/tabs/window_finder_ash.cc" ] |
+ } |
+ } |
+ if (is_mac && mac_views_browser) { |
+ sources += [ |
+ "views/tabs/window_finder.h", |
+ "views/tabs/window_finder_mac.mm", |
+ ] |
+ } |
+ |
if (use_udev) { |
deps += [ "//device/udev_linux" ] |
} |