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

Side by Side Diff: ui/views/views.gyp

Issue 12217151: Use NativeComboboxViews instead of NativeComboboxWin on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Enable NativeComboboxViewsTest on non-Aura Win. Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/controls/combobox/native_combobox_win.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'target_defaults': { 8 'target_defaults': {
9 'conditions': [ 9 'conditions': [
10 ['use_aura==1', { 10 ['use_aura==1', {
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 }, 684 },
685 'include_dirs': [ 685 'include_dirs': [
686 '../third_party/wtl/include', 686 '../third_party/wtl/include',
687 ], 687 ],
688 }], 688 }],
689 ['OS=="win" and win_use_allocator_shim==1', { 689 ['OS=="win" and win_use_allocator_shim==1', {
690 'dependencies': [ 690 'dependencies': [
691 '../../base/allocator/allocator.gyp:allocator', 691 '../../base/allocator/allocator.gyp:allocator',
692 ], 692 ],
693 }], 693 }],
694 ['use_aura==0 and OS=="win"', {
695 'sources/': [
696 ['exclude', 'controls/combobox/native_combobox_views_unittest.cc'],
697 ],
698 }],
699 [ 'use_aura==1', { 694 [ 'use_aura==1', {
700 'dependencies': [ 695 'dependencies': [
701 '../aura/aura.gyp:aura_test_support', 696 '../aura/aura.gyp:aura_test_support',
702 ], 697 ],
703 'sources/': [ 698 'sources/': [
704 ['exclude', 'widget/native_widget_win_unittest.cc'], 699 ['exclude', 'widget/native_widget_win_unittest.cc'],
705 ], 700 ],
706 }, { 701 }, {
707 'sources/': [ 702 'sources/': [
708 ['exclude', '../aura/test/test_desktop_delegate.cc'], 703 ['exclude', '../aura/test/test_desktop_delegate.cc'],
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
948 'sources/': [ 943 'sources/': [
949 # This is needed because the aura rule strips it from the default 944 # This is needed because the aura rule strips it from the default
950 # sources list. 945 # sources list.
951 ['include', '^../../content/app/startup_helper_win.cc'], 946 ['include', '^../../content/app/startup_helper_win.cc'],
952 ], 947 ],
953 }], 948 }],
954 ], 949 ],
955 }, # target_name: views_examples_with_content_exe 950 }, # target_name: views_examples_with_content_exe
956 ], 951 ],
957 } 952 }
OLDNEW
« no previous file with comments | « ui/views/controls/combobox/native_combobox_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698