summaryrefslogtreecommitdiffstats
path: root/chrome/views/SConscript
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-20 20:38:08 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-20 20:38:08 +0000
commit6ff244f244f4e52e5e3dff32b0852bd5be80ec7d (patch)
tree009ce8d2f474444e740266b4e82f2c9a6cde58b2 /chrome/views/SConscript
parent577e30290cc9389a96303b8dd7543459dc50c236 (diff)
downloadchromium_src-6ff244f244f4e52e5e3dff32b0852bd5be80ec7d.zip
chromium_src-6ff244f244f4e52e5e3dff32b0852bd5be80ec7d.tar.gz
chromium_src-6ff244f244f4e52e5e3dff32b0852bd5be80ec7d.tar.bz2
Fix the broken commit in r8250. The problem was that basictypes.h
wasn't getting included before a defined(OS_WIN) check. Review URL: http://codereview.chromium.org/18414 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/SConscript')
-rw-r--r--chrome/views/SConscript14
1 files changed, 11 insertions, 3 deletions
diff --git a/chrome/views/SConscript b/chrome/views/SConscript
index f3ef931..5ec1458 100644
--- a/chrome/views/SConscript
+++ b/chrome/views/SConscript
@@ -174,7 +174,18 @@ if not env.Bit('windows'):
'$CHROME_DIR/tools/build/win/precompiled_wtl.h',
)
+if env.Bit('windows'):
+ input_files += [
+ "root_view_win.cc",
+ "view_win.cc"
+ ]
+
if env.Bit('linux'):
+ input_files += [
+ "root_view_gtk.cc",
+ "view_gtk.cc"
+ ]
+
# TODO(port): Port to Linux.
input_files.Remove(
'accelerator.cc',
@@ -182,7 +193,6 @@ if env.Bit('linux'):
'accessibility/accessible_wrapper.cc',
'accessibility/view_accessibility.cc',
'aero_tooltip_manager.cc',
- 'background.cc',
'base_button.cc',
'bitmap_scroll_bar.cc',
'button.cc',
@@ -212,7 +222,6 @@ if env.Bit('linux'):
'painter.cc',
'radio_button.cc',
'resize_corner.cc',
- 'root_view.cc',
'root_view_drop_target.cc',
'scroll_view.cc',
'separator.cc',
@@ -224,7 +233,6 @@ if env.Bit('linux'):
'throbber.cc',
'tooltip_manager.cc',
'tree_view.cc',
- 'view.cc',
'widget_win.cc',
'window.cc',
'window_delegate.cc',