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

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: remove taskmanager changes: framework 78480k, resources 45232k 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
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 0960e3b7d9abd7618144c754a72664d59d40fe83..4162783e710dad8d891d267c66902d6b73d2bb64 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" ]
}
}
@@ -205,6 +205,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")
@@ -348,7 +353,7 @@ static_library("ui") {
"//ui/views/controls/webview",
]
} else { # 'OS!="win"
- if (use_aura) {
+ if (toolkit_views) {
deps += [
"//ui/views",
"//ui/views/controls/webview",
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698