summaryrefslogtreecommitdiffstats
path: root/ui/ui.gyp
diff options
context:
space:
mode:
authoroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-01 17:51:32 +0000
committeroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-01 17:51:32 +0000
commit939e4ed465fa51c15cb4a57606aa748393ca6bf2 (patch)
treef51b999987743977c1b348f1e8623ef581d84429 /ui/ui.gyp
parent6a33b920912e2b2a01a2f04527041aea8a6a94f2 (diff)
downloadchromium_src-939e4ed465fa51c15cb4a57606aa748393ca6bf2.zip
chromium_src-939e4ed465fa51c15cb4a57606aa748393ca6bf2.tar.gz
chromium_src-939e4ed465fa51c15cb4a57606aa748393ca6bf2.tar.bz2
Remove ViewProp from aura build
Enforce that ViewProp is included only on win, non-aura build. BUG=none TEST=none Review URL: http://codereview.chromium.org/8428010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108128 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
-rw-r--r--ui/ui.gyp8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 7fbe5d0..43763f7 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -321,6 +321,8 @@
['exclude', 'gfx/native_theme_chromeos.cc'],
['exclude', 'gfx/native_theme_chromeos.h'],
['exclude', 'gfx/screen_win.cc'],
+ ['exclude', 'base/view_prop.cc'],
+ ['exclude', 'base/view_prop.h'],
['exclude', 'base/win/mouse_wheel_util.cc'],
['exclude', 'base/win/mouse_wheel_util.h'],
['exclude', 'base/x/active_window_watcher_x.cc'],
@@ -406,8 +408,6 @@
['include', 'base/dragdrop/os_exchange_data_provider_gtk.h'],
['include', 'base/keycodes/keyboard_code_conversion_x.cc'],
['include', 'base/keycodes/keyboard_code_conversion_x.h'],
- ['include', 'base/view_prop.cc'],
- ['include', 'base/view_prop.h'],
['include', 'gfx/gtk_util.cc'],
['include', 'gfx/gtk_util.h'],
['include', 'gfx/path_gtk.cc'],
@@ -469,6 +469,8 @@
'base/dragdrop/drop_target.cc',
'base/dragdrop/drop_target.h',
'base/dragdrop/os_exchange_data.cc',
+ 'base/view_prop.cc',
+ 'base/view_prop.h',
'gfx/native_theme_win.cc',
'gfx/native_theme_win.h',
],
@@ -529,8 +531,6 @@
}],
['toolkit_views==0', {
'sources!': [
- 'base/view_prop.cc',
- 'base/view_prop.h',
'gfx/render_text.cc',
'gfx/render_text.h',
'gfx/render_text_linux.cc',