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

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

Issue 375843002: MacViews: Initial chrome_browser_ui.gypi support for views on mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: #ifdef instead Created 6 years, 5 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 9985886db7e2227015674bf71eda7719df13a7ab..c8a063c4d08019f52d2657ae2040c5668d443a92 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -138,7 +138,7 @@ static_library("ui") {
if (enable_task_manager) {
sources += rebase_path(gypi_values.chrome_browser_ui_task_manager_sources,
".", "//chrome")
- if (!toolkit_views) {
+ if (!toolkit_views || is_mac) {
sources -= [ "views/task_manager_view.cc" ]
}
}
@@ -207,6 +207,11 @@ static_library("ui") {
gypi_values.chrome_browser_ui_views_non_chromeos_sources,
".", "//chrome")
}
+ if (!is_mac) {
+ sources += rebase_path(
+ gypi_values.chrome_browser_ui_views_non_mac_sources,
+ ".", "//chrome")
+ }
if (use_ash) {
sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources,
".", "//chrome")
@@ -353,7 +358,7 @@ static_library("ui") {
#'../ui/views/views.gyp:views', TODO(GYP)
]
} else { # 'OS!="win"
- if (use_aura) {
+ if (toolkit_views) {
deps += [
#'../ui/views/controls/webview/webview.gyp:webview', TODO(GYP)
#'../ui/views/views.gyp:views', TODO(GYP)

Powered by Google App Engine
This is Rietveld 408576698