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

Unified Diff: chrome/browser/ui/BUILD.gn

Issue 2408803002: Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0 (Closed)
Patch Set: reverted changes in base/ime/ Created 4 years, 2 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: chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 79dcb30df8f8a11cca3647460629aded85055f50..1b6c7fb01cd110645d7185b2b440010f1fadd12d 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1517,8 +1517,6 @@ split_static_library("ui") {
sources += [
"external_protocol_dialog_delegate.cc",
"external_protocol_dialog_delegate.h",
- "views/chrome_browser_main_extra_parts_views_linux.cc",
- "views/chrome_browser_main_extra_parts_views_linux.h",
"views/external_protocol_dialog.cc",
"views/external_protocol_dialog.h",
"views/frame/opaque_browser_frame_view.cc",
@@ -1538,6 +1536,14 @@ split_static_library("ui") {
"views/sync/profile_signin_confirmation_dialog_views.cc",
"views/sync/profile_signin_confirmation_dialog_views.h",
]
+
+ # These files rely on Gtk+, which is not available on Ozone builds.
+ if (!use_ozone) {
+ sources += [
+ "views/chrome_browser_main_extra_parts_views_linux.cc",
+ "views/chrome_browser_main_extra_parts_views_linux.h",
+ ]
+ }
}
if (enable_extensions && (!is_mac || mac_views_browser)) {
sources += [
@@ -2991,15 +2997,21 @@ split_static_library("ui") {
"views/apps/chrome_app_window_client_views_linux.cc",
"views/first_run_dialog.cc",
"views/first_run_dialog.h",
- "views/frame/browser_desktop_window_tree_host.h",
- "views/frame/desktop_browser_frame_auralinux.cc",
- "views/frame/desktop_browser_frame_auralinux.h",
"views/frame/native_browser_frame_factory_auralinux.cc",
"views/status_icons/status_icon_linux_wrapper.cc",
"views/status_icons/status_icon_linux_wrapper.h",
"webui/help/version_updater_basic.cc",
"webui/help/version_updater_basic.h",
]
+
+ if (!use_ozone) {
+ sources += [
+ "views/frame/browser_desktop_window_tree_host.h",
+ "views/frame/desktop_browser_frame_auralinux.cc",
+ "views/frame/desktop_browser_frame_auralinux.h",
+ ]
+ }
+
deps += [
"//ui/base/ime",
"//ui/events:dom_keycode_converter",
@@ -3048,6 +3060,10 @@ split_static_library("ui") {
sources -= [ "views/tabs/window_finder_x11.cc" ]
}
}
+
+ if (use_ozone) {
+ sources += [ "views/tabs/window_finder_ozone.cc" ]
+ }
}
if (use_udev) {

Powered by Google App Engine
This is Rietveld 408576698