1 files changed, 34 insertions, 30 deletions
diff --git a/chrome/views/SConscript b/chrome/views/SConscript
index 6030612..a4c541a 100644
--- a/chrome/views/SConscript
+++ b/chrome/views/SConscript
@@ -42,7 +42,6 @@ input_files = ChromeFileList([
   ]),
     'accelerator.cc',
     'accelerator.h',
-    'app_modal_dialog_delegate.h',
     'background.cc',
     'background.h',
     'base_button.cc',
@@ -59,19 +58,11 @@ input_files = ChromeFileList([
     'checkbox.h',
     'chrome_menu.cc',
     'chrome_menu.h',
-    'client_view.cc',
-    'client_view.h',
     'combo_box.cc',
     'combo_box.h',
     'controller.h',
-    'custom_frame_window.cc',
-    'custom_frame_window.h',
     'decision.cc',
     'decision.h',
-    'dialog_client_view.cc',
-    'dialog_client_view.h',
-    'dialog_delegate.cc',
-    'dialog_delegate.h',
     'event.cc',
     'event.h',
     'external_focus_tracker.cc',
@@ -104,8 +95,6 @@ input_files = ChromeFileList([
     'native_control.h',
     'native_scroll_bar.cc',
     'native_scroll_bar.h',
-    'non_client_view.cc',
-    'non_client_view.h',
     'painter.cc',
     'painter.h',
     '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX',
@@ -160,11 +149,24 @@ input_files = ChromeFileList([
     'widget/widget.h',
     'widget/widget_win.cc',
     'widget/widget_win.h',
-    'window.cc',
-    'window.h',
-    'window_delegate.cc',
-    'window_delegate.h',
-    'window_resources.h',
+    'window/app_modal_dialog_delegate.h',
+    'window/client_view.cc',
+    'window/client_view.h',
+    'window/custom_frame_view.cc',
+    'window/custom_frame_view.h',
+    'window/dialog_client_view.cc',
+    'window/dialog_client_view.h',
+    'window/dialog_delegate.cc',
+    'window/dialog_delegate.h',
+    'window/native_frame_view.cc',
+    'window/native_frame_view.h',
+    'window/non_client_view.cc',
+    'window/non_client_view.h',
+    'window/window.cc',
+    'window/window.h',
+    'window/window_delegate.cc',
+    'window/window_delegate.h',
+    'window/window_resources.h',
 ])
 
 if not env.Bit('windows'):
@@ -220,11 +222,7 @@ if env.Bit('linux'):
       'button_dropdown.cc',
       'checkbox.cc',
       'chrome_menu.cc',
-      'client_view.cc',
       'combo_box.cc',
-      'custom_frame_window.cc',
-      'dialog_delegate.cc',
-      'dialog_client_view.cc',
       'decision.cc',
       'event.cc',
       'focus_manager.cc',
@@ -237,7 +235,6 @@ if env.Bit('linux'):
       'native_button.cc',
       'native_control.cc',
       'native_scroll_bar.cc',
-      'non_client_view.cc',
       'radio_button.cc',
       'resize_corner.cc',
       'separator.cc',
@@ -252,8 +249,14 @@ if env.Bit('linux'):
       'widget/root_view_drop_target.cc',
       'widget/tooltip_manager.cc',
       'widget/widget_win.cc',
-      'window.cc',
-      'window_delegate.cc',
+      'window/client_view.cc',
+      'window/custom_frame_view.cc',
+      'window/dialog_delegate.cc',
+      'window/dialog_client_view.cc',
+      'window/native_frame_view.cc',
+      'window/non_client_view.cc',
+      'window/window_delegate.cc',
+      'window/window_win.cc',
   )
 
 if env.Bit('mac'):
@@ -271,11 +274,7 @@ if env.Bit('mac'):
       'button_dropdown.cc',
       'checkbox.cc',
       'chrome_menu.cc',
-      'client_view.cc',
       'combo_box.cc',
-      'custom_frame_window.cc',
-      'dialog_delegate.cc',
-      'dialog_client_view.cc',
       'decision.cc',
       'event.cc',
       'external_focus_tracker.cc',
@@ -293,7 +292,6 @@ if env.Bit('mac'):
       'native_button.cc',
       'native_control.cc',
       'native_scroll_bar.cc',
-      'non_client_view.cc',
       'painter.cc',
       'radio_button.cc',
       'repeat_controller.cc',
@@ -315,8 +313,14 @@ if env.Bit('mac'):
       'widget/root_view_drop_target.cc',
       'widget/tooltip_manager.cc',
       'widget/widget_win.cc',
-      'window.cc',
-      'window_delegate.cc',
+      'window/client_view.cc',
+      'window/custom_frame_view.cc',
+      'window/dialog_delegate.cc',
+      'window/dialog_client_view.cc',
+      'window/native_frame_view.cc',
+      'window/non_client_view.cc',
+      'window/window_delegate.cc',
+      'window/window_win.cc',
   )
 
 env.ChromeLibrary('views', input_files)