forgot the sconscript

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11846 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 121 insertions, 125 deletions

diff --git a/chrome/views/SConscript b/chrome/views/SConscript
index c891c2f..9a25feb 100644
--- a/chrome/views/SConscript
+++ b/chrome/views/SConscript
@@ -44,25 +44,23 @@ input_files = ChromeFileList([
     'accelerator.h',
     'background.cc',
     'background.h',
-    'base_button.cc',
-    'base_button.h',
-    'bitmap_scroll_bar.cc',
-    'bitmap_scroll_bar.h',
+    'controls/button/button.cc',
+    'controls/button/button.h',
+    'controls/scrollbar/bitmap_scroll_bar.cc',
+    'controls/scrollbar/bitmap_scroll_bar.h',
     'border.cc',
     'border.h',
-    'button.cc',
-    'button.h',
-    'button_dropdown.cc',
-    'button_dropdown.h',
-    'checkbox.cc',
-    'checkbox.h',
-    'chrome_menu.cc',
-    'chrome_menu.h',
-    'combo_box.cc',
-    'combo_box.h',
-    'controller.h',
-    'decision.cc',
-    'decision.h',
+    'controls/button/image_button.cc',
+    'controls/button/image_button.h',
+    'controls/button/button_dropdown.cc',
+    'controls/button/button_dropdown.h',
+    'controls/button/checkbox.cc',
+    'controls/button/checkbox.h',
+    'controls/menu/chrome_menu.cc',
+    'controls/menu/chrome_menu.h',
+    'controls/combo_box.cc',
+    'controls/combo_box.h',
+    'controls/menu/controller.h',
     'event.cc',
     'event.h',
     'focus/external_focus_tracker.cc',
@@ -73,68 +71,68 @@ input_files = ChromeFileList([
     'focus/view_storage.h',
     'grid_layout.cc',
     'grid_layout.h',
-    'group_table_view.cc',
-    'group_table_view.h',
-    'hwnd_view.cc',
-    'hwnd_view.h',
-    'image_view.cc',
-    'image_view.h',
-    'label.cc',
-    'label.h',
+    'controls/table/group_table_view.cc',
+    'controls/table/group_table_view.h',
+    'controls/hwnd_view.cc',
+    'controls/hwnd_view.h',
+    'controls/image_view.cc',
+    'controls/image_view.h',
+    'controls/label.cc',
+    'controls/label.h',
     'layout_manager.cc',
     'layout_manager.h',
-    'link.cc',
-    'link.h',
-    'menu.cc',
-    'menu.h',
-    'menu_button.cc',
-    'menu_button.h',
-    'message_box_view.cc',
-    'message_box_view.h',
-    'native_button.cc',
-    'native_button.h',
-    'native_control.cc',
-    'native_control.h',
-    'native_scroll_bar.cc',
-    'native_scroll_bar.h',
+    'controls/link.cc',
+    'controls/link.h',
+    'controls/menu/menu.cc',
+    'controls/menu/menu.h',
+    'controls/button/menu_button.cc',
+    'controls/button/menu_button.h',
+    'controls/message_box_view.cc',
+    'controls/message_box_view.h',
+    'controls/button/native_button.cc',
+    'controls/button/native_button.h',
+    'controls/native_control.cc',
+    'controls/native_control.h',
+    'controls/scrollbar/native_scroll_bar.cc',
+    'controls/scrollbar/native_scroll_bar.h',
     'painter.cc',
     'painter.h',
     '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
     '$CHROME_DIR/tools/build/win/precompiled_wtl.h',
-    'radio_button.cc',
-    'radio_button.h',
+    'controls/button/radio_button.cc',
+    'controls/button/radio_button.h',
     'repeat_controller.cc',
     'repeat_controller.h',
     'resize_corner.cc',
     'resize_corner.h',
-    'scroll_bar.cc',
-    'scroll_bar.h',
-    'scroll_view.cc',
-    'scroll_view.h',
-    'separator.cc',
-    'separator.h',
-    'single_split_view.cc',
-    'single_split_view.h',
-    'tabbed_pane.cc',
-    'tabbed_pane.h',
-    'table_view.cc',
-    'table_view.h',
-    'text_button.cc',
-    'text_button.h',
-    'text_field.cc',
-    'text_field.h',
-    'throbber.cc',
-    'throbber.h',
-    'tree_model.h',
-    'tree_node_iterator.h',
-    'tree_node_model.h',
-    'tree_view.cc',
-    'tree_view.h',
+    'controls/scrollbar/scroll_bar.cc',
+    'controls/scrollbar/scroll_bar.h',
+    'controls/scroll_view.cc',
+    'controls/scroll_view.h',
+    'controls/separator.cc',
+    'controls/separator.h',
+    'controls/single_split_view.cc',
+    'controls/single_split_view.h',
+    'controls/tabbed_pane.cc',
+    'controls/tabbed_pane.h',
+    'controls/table/table_view.cc',
+    'controls/table/table_view.h',
+    'controls/button/text_button.cc',
+    'controls/button/text_button.h',
+    'controls/text_field.cc',
+    'controls/text_field.h',
+    'controls/throbber.cc',
+    'controls/throbber.h',
+    'controls/tree/tree_model.h',
+    'controls/tree/tree_node_iterator.h',
+    'controls/tree/tree_node_model.h',
+    'controls/tree/tree_view.cc',
+    'controls/tree/tree_view.h',
     'view.cc',
     'view.h',
     'view_constants.cc',
     'view_constants.h',
-    'view_menu_delegate.h',
+    'controls/menu/view_menu_delegate.h',
     'widget/accelerator_handler.cc',
     'widget/accelerator_handler.h',
     'widget/aero_tooltip_manager.cc',
@@ -198,14 +196,14 @@ if env.Bit('linux'):
 #       'focus/external_focus_tracker.cc',
 #       'focus/view_storage.cc',
 #       'grid_layout.cc',
-#       'image_view.cc',
-#       'label.cc',
+#       'controls/image_view.cc',
+#       'controls/label.cc',
 #       'layout_manager.cc',
 #       'painter.cc',
 #       'repeat_controller.cc',
-#       'scroll_bar.cc',
-#       'scroll_view.cc',
-#       'throbber.cc',
+#       'controls/scrollbar/scroll_bar.cc',
+#       'controls/scroll_view.cc',
+#       'controls/throbber.cc',
 #       'view.cc',
 #       'widget/root_view.cc',
 #  )
@@ -215,34 +213,33 @@ if env.Bit('linux'):
       'accelerator.cc',
       'accessibility/accessible_wrapper.cc',
       'accessibility/view_accessibility.cc',
-      'base_button.cc',
-      'bitmap_scroll_bar.cc',
-      'button.cc',
-      'button_dropdown.cc',
-      'checkbox.cc',
-      'chrome_menu.cc',
-      'combo_box.cc',
-      'decision.cc',
+      'controls/button/button.cc',
+      'controls/scrollbar/bitmap_scroll_bar.cc',
+      'controls/button/image_button.cc',
+      'controls/button/button_dropdown.cc',
+      'controls/button/checkbox.cc',
+      'controls/menu/chrome_menu.cc',
+      'controls/combo_box.cc',
       'event.cc',
       'focus/focus_manager.cc',
-      'group_table_view.cc',
-      'hwnd_view.cc',
-      'link.cc',
-      'menu.cc',
-      'menu_button.cc',
-      'message_box_view.cc',
-      'native_button.cc',
-      'native_control.cc',
-      'native_scroll_bar.cc',
-      'radio_button.cc',
+      'controls/table/group_table_view.cc',
+      'controls/hwnd_view.cc',
+      'controls/link.cc',
+      'controls/menu/menu.cc',
+      'controls/button/menu_button.cc',
+      'controls/message_box_view.cc',
+      'controls/button/native_button.cc',
+      'controls/native_control.cc',
+      'controls/scrollbar/native_scroll_bar.cc',
+      'controls/button/radio_button.cc',
       'resize_corner.cc',
-      'separator.cc',
-      'single_split_view.cc',
-      'tabbed_pane.cc',
-      'table_view.cc',
-      'text_button.cc',
-      'text_field.cc',
-      'tree_view.cc',
+      'controls/separator.cc',
+      'controls/single_split_view.cc',
+      'controls/tabbed_pane.cc',
+      'controls/table/table_view.cc',
+      'controls/button/text_button.cc',
+      'controls/text_field.cc',
+      'controls/tree/tree_view.cc',
       'widget/accelerator_handler.cc',
       'widget/aero_tooltip_manager.cc',
       'widget/root_view_drop_target.cc',
@@ -266,46 +263,45 @@ if env.Bit('mac'):
       'accessibility/accessible_wrapper.cc',
       'accessibility/view_accessibility.cc',
       'background.cc',
-      'base_button.cc',
-      'bitmap_scroll_bar.cc',
+      'controls/button/button.cc',
+      'controls/scrollbar/bitmap_scroll_bar.cc',
       'border.cc',
-      'button.cc',
-      'button_dropdown.cc',
-      'checkbox.cc',
-      'chrome_menu.cc',
-      'combo_box.cc',
-      'decision.cc',
+      'controls/button/image_button.cc',
+      'controls/button/button_dropdown.cc',
+      'controls/button/checkbox.cc',
+      'controls/menu/chrome_menu.cc',
+      'controls/combo_box.cc',
       'event.cc',
       'focus/external_focus_tracker.cc',
       'focus/focus_manager.cc',
       'focus/view_storage.cc',
       'grid_layout.cc',
-      'group_table_view.cc',
-      'hwnd_view.cc',
-      'image_view.cc',
-      'label.cc',
+      'controls/table/group_table_view.cc',
+      'controls/hwnd_view.cc',
+      'controls/image_view.cc',
+      'controls/label.cc',
       'layout_manager.cc',
-      'link.cc',
-      'menu.cc',
-      'menu_button.cc',
-      'message_box_view.cc',
-      'native_button.cc',
-      'native_control.cc',
-      'native_scroll_bar.cc',
+      'controls/link.cc',
+      'controls/menu/menu.cc',
+      'controls/button/menu_button.cc',
+      'controls/message_box_view.cc',
+      'controls/button/native_button.cc',
+      'controls/native_control.cc',
+      'controls/scrollbar/native_scroll_bar.cc',
       'painter.cc',
-      'radio_button.cc',
+      'controls/button/radio_button.cc',
       'repeat_controller.cc',
       'resize_corner.cc',
-      'scroll_bar.cc',
-      'scroll_view.cc',
-      'separator.cc',
-      'single_split_view.cc',
-      'tabbed_pane.cc',
-      'table_view.cc',
-      'text_button.cc',
-      'text_field.cc',
-      'throbber.cc',
-      'tree_view.cc',
+      'controls/scrollbar/scroll_bar.cc',
+      'controls/scroll_view.cc',
+      'controls/separator.cc',
+      'controls/single_split_view.cc',
+      'controls/tabbed_pane.cc',
+      'controls/table/table_view.cc',
+      'controls/button/text_button.cc',
+      'controls/text_field.cc',
+      'controls/throbber.cc',
+      'controls/tree/tree_view.cc',
       'view.cc',
       'widget/aero_tooltip_manager.cc',
       'widget/root_view.cc',