Revert 215753 "Move native_app_window code to apps areas"

trunk/src/chrome/chrome_browser_ui.gypi

Index: trunk/src/chrome/chrome_browser_ui.gypi
===================================================================
--- trunk/src/chrome/chrome_browser_ui.gypi	(revision 215780)
+++ trunk/src/chrome/chrome_browser_ui.gypi	(working copy)
@@ -425,9 +425,6 @@
         'browser/ui/cocoa/applescript/tab_applescript.mm',
         'browser/ui/cocoa/applescript/window_applescript.h',
         'browser/ui/cocoa/applescript/window_applescript.mm',
-        'browser/ui/cocoa/apps/chrome_shell_window_delegate_cocoa.mm',
-        'browser/ui/cocoa/apps/native_app_window_cocoa.h',
-        'browser/ui/cocoa/apps/native_app_window_cocoa.mm',
         'browser/ui/cocoa/autofill/autofill_account_chooser.h',
         'browser/ui/cocoa/autofill/autofill_account_chooser.mm',
         'browser/ui/cocoa/autofill/autofill_details_container.h',
@@ -654,6 +651,8 @@
         'browser/ui/cocoa/extensions/extension_view_mac.mm',
         'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h',
         'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm',
+        'browser/ui/cocoa/extensions/native_app_window_cocoa.h',
+        'browser/ui/cocoa/extensions/native_app_window_cocoa.mm',
         'browser/ui/cocoa/external_protocol_dialog.h',
         'browser/ui/cocoa/external_protocol_dialog.mm',
         'browser/ui/cocoa/fast_resize_view.h',
@@ -977,6 +976,7 @@
         'browser/ui/extensions/extension_enable_flow.cc',
         'browser/ui/extensions/extension_enable_flow.h',
         'browser/ui/extensions/extension_enable_flow_delegate.h',
+        'browser/ui/extensions/native_app_window.h',
         'browser/ui/external_protocol_dialog_delegate.cc',
         'browser/ui/external_protocol_dialog_delegate.h',
         'browser/ui/fast_unload_controller.cc',
@@ -1008,9 +1008,6 @@
         'browser/ui/gtk/accelerator_utils_gtk.cc',
         'browser/ui/gtk/accelerators_gtk.cc',
         'browser/ui/gtk/accelerators_gtk.h',
-        'browser/ui/gtk/apps/chrome_shell_window_delegate_gtk.cc',
-        'browser/ui/gtk/apps/native_app_window_gtk.cc',
-        'browser/ui/gtk/apps/native_app_window_gtk.h',
         'browser/ui/gtk/autofill/autofill_popup_view_gtk.cc',
         'browser/ui/gtk/autofill/autofill_popup_view_gtk.h',
         'browser/ui/gtk/avatar_menu_bubble_gtk.cc',
@@ -1100,6 +1097,8 @@
         'browser/ui/gtk/extensions/extension_view_gtk.h',
         'browser/ui/gtk/extensions/media_galleries_dialog_gtk.cc',
         'browser/ui/gtk/extensions/media_galleries_dialog_gtk.h',
+        'browser/ui/gtk/extensions/native_app_window_gtk.cc',
+        'browser/ui/gtk/extensions/native_app_window_gtk.h',
         'browser/ui/gtk/find_bar_gtk.cc',
         'browser/ui/gtk/find_bar_gtk.h',
         'browser/ui/gtk/first_run_bubble.cc',
@@ -1532,9 +1531,6 @@
         'browser/ui/views/app_menu_button_win.cc',
         'browser/ui/views/app_menu_button_win.h',
         'browser/ui/views/app_list/app_list_controller_win.cc',
-        'browser/ui/views/apps/chrome_shell_window_delegate_views.cc',
-        'browser/ui/views/apps/native_app_window_views.cc',
-        'browser/ui/views/apps/native_app_window_views.h',
         'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc',
         'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
         'browser/ui/views/ash/tab_scrubber.h',
@@ -1654,6 +1650,8 @@
         'browser/ui/views/extensions/extension_view_views.h',
         'browser/ui/views/extensions/media_galleries_dialog_views.cc',
         'browser/ui/views/extensions/media_galleries_dialog_views.h',
+        'browser/ui/views/extensions/native_app_window_views.cc',
+        'browser/ui/views/extensions/native_app_window_views.h',
         'browser/ui/views/extensions/shell_window_frame_view.cc',
         'browser/ui/views/extensions/shell_window_frame_view.h',
         'browser/ui/views/external_protocol_dialog.cc',