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

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

Issue 2314353002: MacViews: Fix mac_views_browser build linker errors. (Closed)
Patch Set: Created 4 years, 3 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 | « no previous file | no next file » | 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 dc233998ae017c7c4d5b06b677cf84b716e9819d..e0acecbcf86cdca861158c061e81170b7dad55a7 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1543,7 +1543,7 @@ split_static_library("ui") {
]
}
}
- if (!is_mac) {
+ if (!is_mac || mac_views_browser) {
sources += [
# This test header is included because it contains forward declarations
# needed for "friend" statements for use in tests.
@@ -1827,20 +1827,23 @@ split_static_library("ui") {
"views/website_settings/chooser_bubble_ui_view.h",
"views/website_settings/permission_prompt_impl_views.cc",
]
- if (use_aura) {
- deps += [
- "//services/ui/public/cpp",
- "//services/ui/public/interfaces",
- ]
- # TODO(erg): These files hard depend on mus, and thus can't be in a gyp
- # build. When gyp goes away, merge this back into the sources list.
- sources += [
- "views/tabs/window_finder_mus.cc",
- "views/tabs/window_finder_mus.h",
- ]
+ if (!mac_views_browser) {
karandeepb 2016/09/07 08:32:12 If use_aura is true doesn't that imply !mac_views_
Patti Lor 2016/09/08 04:00:41 That's a good point, I will move this if statement
+ if (use_aura) {
+ deps += [
+ "//services/ui/public/cpp",
+ "//services/ui/public/interfaces",
+ ]
+
+ # TODO(erg): These files hard depend on mus, and thus can't be in a gyp
+ # build. When gyp goes away, merge this back into the sources list.
+ sources += [
+ "views/tabs/window_finder_mus.cc",
+ "views/tabs/window_finder_mus.h",
+ ]
+ }
+ deps += [ "//ui/views/mus" ]
}
- deps += [ "//ui/views/mus" ]
}
if (use_ash) {
sources += [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698