[content shell] move app startup related code to app subdir

BUG=180021
TBR=marja@chromium.org

Review URL: https://codereview.chromium.org/15060007

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

1 files changed, 14 insertions, 14 deletions

diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 35e7928..2919ba3 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -64,6 +64,8 @@
         'shell/android/shell_jni_registrar.h',
         'shell/android/shell_manager.cc',
         'shell/android/shell_manager.h',
+        'shell/app/shell_main_delegate.cc',
+        'shell/app/shell_main_delegate.h',
         'shell/common/shell_content_client.cc',
         'shell/common/shell_content_client.h',
         'shell/common/shell_messages.cc',
@@ -122,8 +124,6 @@
         'shell/shell_login_dialog_mac.mm',
         'shell/shell_login_dialog.cc',
         'shell/shell_login_dialog.h',
-        'shell/shell_main_delegate.cc',
-        'shell/shell_main_delegate.h',
         'shell/shell_message_filter.cc',
         'shell/shell_message_filter.h',
         'shell/shell_network_delegate.cc',
@@ -331,20 +331,20 @@
       ],
       'sources': [
         'app/startup_helper_win.cc',
-        'shell/shell_main.cc',
+        'shell/app/shell_main.cc',
       ],
       'mac_bundle_resources': [
-        'shell/mac/app.icns',
-        'shell/mac/app-Info.plist',
+        'shell/app/app.icns',
+        'shell/app/app-Info.plist',
       ],
       # TODO(mark): Come up with a fancier way to do this.  It should only
       # be necessary to list app-Info.plist once, not the three times it is
       # listed here.
       'mac_bundle_resources!': [
-        'shell/mac/app-Info.plist',
+        'shell/app/app-Info.plist',
       ],
       'xcode_settings': {
-        'INFOPLIST_FILE': 'shell/mac/app-Info.plist',
+        'INFOPLIST_FILE': 'shell/app/app-Info.plist',
       },
       'msvs_settings': {
         'VCLinkerTool': {
@@ -359,7 +359,7 @@
         }],
         ['OS=="win"', {
           'sources': [
-            'shell/shell.rc',
+            'shell/app/shell.rc',
           ],
           'configurations': {
             'Debug_Base': {
@@ -469,8 +469,8 @@
           'product_name': '<(content_shell_product_name) Framework',
           'mac_bundle': 1,
           'mac_bundle_resources': [
-            'shell/mac/English.lproj/HttpAuth.xib',
-            'shell/mac/English.lproj/MainMenu.xib',
+            'shell/app/English.lproj/HttpAuth.xib',
+            'shell/app/English.lproj/MainMenu.xib',
             '<(PRODUCT_DIR)/content_shell.pak'
           ],
           'dependencies': [
@@ -520,14 +520,14 @@
             'content_shell_framework',
           ],
           'sources': [
-            'shell/shell_main.cc',
-            'shell/mac/helper-Info.plist',
+            'shell/app/shell_main.cc',
+            'shell/app/helper-Info.plist',
           ],
           # TODO(mark): Come up with a fancier way to do this.  It should only
           # be necessary to list helper-Info.plist once, not the three times it
           # is listed here.
           'mac_bundle_resources!': [
-            'shell/mac/helper-Info.plist',
+            'shell/app/helper-Info.plist',
           ],
           # TODO(mark): For now, don't put any resources into this app.  Its
           # resources directory will be a symbolic link to the browser app's
@@ -536,7 +536,7 @@
             ['exclude', '.*'],
           ],
           'xcode_settings': {
-            'INFOPLIST_FILE': 'shell/mac/helper-Info.plist',
+            'INFOPLIST_FILE': 'shell/app/helper-Info.plist',
           },
           'postbuilds': [
             {