diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-17 01:36:03 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-17 01:36:03 +0000 |
| commit | e044f8df992fcb9f289b98115d0722dcd8cea103 (patch) | |
| tree | 6844ce69dfaf4cbdfe0e540e6647ef60b3c22451 /chrome/views/SConscript | |
| parent | 81514c583f3c281ddbb72d13a021bfed58f7e3c7 (diff) | |
| download | chromium_src-e044f8df992fcb9f289b98115d0722dcd8cea103.zip chromium_src-e044f8df992fcb9f289b98115d0722dcd8cea103.tar.gz chromium_src-e044f8df992fcb9f289b98115d0722dcd8cea103.tar.bz2 | |
Revert "Add #ifdefs to the views/ code and move windows specific code
into their own files to get some files compiling."
Conflicts with something that went in in the interim...
Review URL: http://codereview.chromium.org/18187
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8251 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/SConscript')
| -rw-r--r-- | chrome/views/SConscript | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/chrome/views/SConscript b/chrome/views/SConscript index a15a0e5..7e4596a 100644 --- a/chrome/views/SConscript +++ b/chrome/views/SConscript @@ -92,18 +92,7 @@ input_files = [ 'window_delegate.cc', ] -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. remove_files = [ 'accelerator.cc', @@ -111,6 +100,7 @@ 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', @@ -140,6 +130,7 @@ 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', @@ -151,6 +142,7 @@ if env.Bit('linux'): 'throbber.cc', 'tooltip_manager.cc', 'tree_view.cc', + 'view.cc', 'widget_win.cc', 'window.cc', 'window_delegate.cc', |