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

Unified Diff: ui/base/ui_base.gyp

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/ui_base.gyp
diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
index 5edc762106fcf383f7d806e4cc0d12db9e35b71f..df4e1f07f46b826d9138f0d0b6f62d956c4937ff 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -355,6 +355,12 @@
}],
],
'conditions': [
+ ['OS=="chromeos" or OS=="linux" or OS=="win"', {
+ 'sources': [
+ 'resource/material_design/material_design_controller.cc',
+ 'resource/material_design/material_design_controller.h',
+ ]
+ }],
['OS=="ios"', {
# iOS only uses a subset of UI.
'sources/': [
@@ -663,6 +669,12 @@
'../..',
],
'conditions': [
+ ['OS=="chromeos" or OS=="linux" or OS=="win"', {
+ 'sources': [
+ 'test/material_design_controller_test_api.cc',
+ 'test/material_design_controller_test_api.h',
+ ]
+ }],
['OS!="ios"', {
'dependecies': [
'ime/ui_base_ime.gyp:ui_base_ime',

Powered by Google App Engine
This is Rietveld 408576698