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

Side by Side 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 unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 'x/x11_util_internal.h', 348 'x/x11_util_internal.h',
349 ], 349 ],
350 'target_conditions': [ 350 'target_conditions': [
351 ['OS == "ios"', { 351 ['OS == "ios"', {
352 'sources/': [ 352 'sources/': [
353 ['include', '^l10n/l10n_util_mac\\.mm$'], 353 ['include', '^l10n/l10n_util_mac\\.mm$'],
354 ], 354 ],
355 }], 355 }],
356 ], 356 ],
357 'conditions': [ 357 'conditions': [
358 ['OS=="chromeos" or OS=="linux" or OS=="win"', {
359 'sources': [
360 'resource/material_design/material_design_controller.cc',
361 'resource/material_design/material_design_controller.h',
362 ]
363 }],
358 ['OS=="ios"', { 364 ['OS=="ios"', {
359 # iOS only uses a subset of UI. 365 # iOS only uses a subset of UI.
360 'sources/': [ 366 'sources/': [
361 ['exclude', '\\.(cc|mm)$'], 367 ['exclude', '\\.(cc|mm)$'],
362 ['include', '_ios\\.(cc|mm)$'], 368 ['include', '_ios\\.(cc|mm)$'],
363 ['include', '(^|/)ios/'], 369 ['include', '(^|/)ios/'],
364 ['include', '^l10n/'], 370 ['include', '^l10n/'],
365 ['include', '^layout'], 371 ['include', '^layout'],
366 ['include', '^page_transition_type'], 372 ['include', '^page_transition_type'],
367 ['include', '^resource/'], 373 ['include', '^resource/'],
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 'test/ui_controls_aura.cc', 662 'test/ui_controls_aura.cc',
657 'test/ui_controls_internal_win.cc', 663 'test/ui_controls_internal_win.cc',
658 'test/ui_controls_internal_win.h', 664 'test/ui_controls_internal_win.h',
659 'test/ui_controls_mac.mm', 665 'test/ui_controls_mac.mm',
660 'test/ui_controls_win.cc', 666 'test/ui_controls_win.cc',
661 ], 667 ],
662 'include_dirs': [ 668 'include_dirs': [
663 '../..', 669 '../..',
664 ], 670 ],
665 'conditions': [ 671 'conditions': [
672 ['OS=="chromeos" or OS=="linux" or OS=="win"', {
673 'sources': [
674 'test/material_design_controller_test_api.cc',
675 'test/material_design_controller_test_api.h',
676 ]
677 }],
666 ['OS!="ios"', { 678 ['OS!="ios"', {
667 'dependecies': [ 679 'dependecies': [
668 'ime/ui_base_ime.gyp:ui_base_ime', 680 'ime/ui_base_ime.gyp:ui_base_ime',
669 ], 681 ],
670 'sources': [ 682 'sources': [
671 'ime/dummy_input_method.cc', 683 'ime/dummy_input_method.cc',
672 'ime/dummy_input_method.h', 684 'ime/dummy_input_method.h',
673 'ime/dummy_text_input_client.cc', 685 'ime/dummy_text_input_client.cc',
674 'ime/dummy_text_input_client.h', 686 'ime/dummy_text_input_client.h',
675 'test/nswindow_fullscreen_notification_waiter.h', 687 'test/nswindow_fullscreen_notification_waiter.h',
(...skipping 29 matching lines...) Expand all
705 ], 717 ],
706 'variables': { 718 'variables': {
707 'jni_gen_package': 'ui', 719 'jni_gen_package': 'ui',
708 }, 720 },
709 'includes': [ '../../build/jni_generator.gypi' ], 721 'includes': [ '../../build/jni_generator.gypi' ],
710 }, 722 },
711 ], 723 ],
712 }], 724 }],
713 ], 725 ],
714 } 726 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698