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

Unified Diff: ui/base/BUILD.gn

Issue 1188713007: Moved --top-chrome-md command line switch from chrome_switches to ui_base_switches. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed typedef in unittest. Created 5 years, 6 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: ui/base/BUILD.gn
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index f8c68a6b8d9d77e88315c3a9f9c7cd2e85e6b0b7..259672db8a3ec125af2fe102fb97bf3abb34b1ce 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -283,6 +283,13 @@ component("base") {
"work_area_watcher_observer.h",
]
+ if (is_chromeos || is_linux || is_win) {
+ sources += [
+ "resource/material_design/material_design_controller.cc",
+ "resource/material_design/material_design_controller.h",
+ ]
+ }
+
if (is_win) {
sources += [ "touch/touch_device_win.cc" ]
} else if (is_android) {
@@ -595,6 +602,13 @@ source_set("test_support") {
deps += [ "//ui/base/ime" ]
}
+ if (is_chromeos || is_linux || is_win) {
+ sources += [
+ "test/material_design_controller_test_api.cc",
+ "test/material_design_controller_test_api.h",
+ ]
+ }
+
if (!use_aura) {
sources -= [ "test/ui_controls_aura.cc" ]
} else if (is_win) {
@@ -634,6 +648,11 @@ test("ui_base_unittests") {
"user_activity/user_activity_detector_unittest.cc",
]
+ if (is_chromeos || is_linux || is_win) {
+ sources +=
+ [ "resource/material_design/material_design_controller_unittest.cc" ]
+ }
+
if (is_android) {
sources -= [ "user_activity/user_activity_detector_unittest.cc" ]
}

Powered by Google App Engine
This is Rietveld 408576698