[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

21 files changed, 31 insertions, 31 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': [
             {
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 7818c55..c4db3aa 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -851,8 +851,8 @@
                 '<(SHARED_INTERMEDIATE_DIR)/webkit',
               ],
               'sources': [
-                'shell/resource.h',
-                'shell/shell.rc',
+                'shell/app/resource.h',
+                'shell/app/shell.rc',
                 # TODO:  It would be nice to have these pulled in
                 # automatically from direct_dependent_settings in
                 # their various targets (net.gyp:net_resources, etc.),
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.cc b/content/shell/android/browsertests_apk/content_browser_tests_android.cc
index 3425480..99c6171 100644
--- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc
+++ b/content/shell/android/browsertests_apk/content_browser_tests_android.cc
@@ -24,7 +24,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_launcher.h"
 #include "content/shell/android/shell_jni_registrar.h"
-#include "content/shell/shell_main_delegate.h"
+#include "content/shell/app/shell_main_delegate.h"
 #include "content/test/browser_test_message_pump_android.h"
 #include "jni/ContentBrowserTestsActivity_jni.h"
 #include "testing/android/native_test_util.h"
diff --git a/content/shell/android/shell_library_loader.cc b/content/shell/android/shell_library_loader.cc
index f320387f..599e421 100644
--- a/content/shell/android/shell_library_loader.cc
+++ b/content/shell/android/shell_library_loader.cc
@@ -11,7 +11,7 @@
 #include "content/public/app/content_main.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/shell/android/shell_jni_registrar.h"
-#include "content/shell/shell_main_delegate.h"
+#include "content/shell/app/shell_main_delegate.h"
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
diff --git a/content/shell/mac/English.lproj/HttpAuth.xib b/content/shell/app/English.lproj/HttpAuth.xib
index 2a2ac00..2a2ac00 100644
--- a/content/shell/mac/English.lproj/HttpAuth.xib
+++ b/content/shell/app/English.lproj/HttpAuth.xib
diff --git a/content/shell/mac/English.lproj/MainMenu.xib b/content/shell/app/English.lproj/MainMenu.xib
index 91db5fc..91db5fc 100644
--- a/content/shell/mac/English.lproj/MainMenu.xib
+++ b/content/shell/app/English.lproj/MainMenu.xib
diff --git a/content/shell/mac/app-Info.plist b/content/shell/app/app-Info.plist
index 84e98b2..84e98b2 100644
--- a/content/shell/mac/app-Info.plist
+++ b/content/shell/app/app-Info.plist
diff --git a/content/shell/mac/app.icns b/content/shell/app/app.icns
index f36742d..f36742d 100644
--- a/content/shell/mac/app.icns
+++ b/content/shell/app/app.icns
diff --git a/content/shell/mac/helper-Info.plist b/content/shell/app/helper-Info.plist
index 646d48f..646d48f 100644
--- a/content/shell/mac/helper-Info.plist
+++ b/content/shell/app/helper-Info.plist
diff --git a/content/shell/resource.h b/content/shell/app/resource.h
index 29bb74d..29bb74d 100644
--- a/content/shell/resource.h
+++ b/content/shell/app/resource.h
diff --git a/content/shell/shell.rc b/content/shell/app/shell.rc
index 0ea80bf..8034111 100644
--- a/content/shell/shell.rc
+++ b/content/shell/app/shell.rc
@@ -1,6 +1,6 @@
 //Microsoft Visual C++ generated resource script.
 //
-#include "shell/resource.h"
+#include "shell/app/resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
diff --git a/content/shell/shell_main.cc b/content/shell/app/shell_main.cc
index d03831b..9473446 100644
--- a/content/shell/shell_main.cc
+++ b/content/shell/app/shell_main.cc
@@ -4,7 +4,7 @@
 
 #include "content/public/app/content_main.h"
 
-#include "content/shell/shell_main_delegate.h"
+#include "content/shell/app/shell_main_delegate.h"
 #include "sandbox/win/src/sandbox_types.h"
 
 #if defined(OS_WIN)
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index 9cf68fa..9ac38c9 100644
--- a/content/shell/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/shell/shell_main_delegate.h"
+#include "content/shell/app/shell_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
diff --git a/content/shell/shell_main_delegate.h b/content/shell/app/shell_main_delegate.h
index 7d6bf2c..73c6d04 100644
--- a/content/shell/shell_main_delegate.h
+++ b/content/shell/app/shell_main_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_SHELL_SHELL_MAIN_DELEGATE_H_
-#define CONTENT_SHELL_SHELL_MAIN_DELEGATE_H_
+#ifndef CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_
+#define CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ -48,4 +48,4 @@ class ShellMainDelegate : public ContentMainDelegate {
 
 }  // namespace content
 
-#endif  // CONTENT_SHELL_SHELL_MAIN_DELEGATE_H_
+#endif  // CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_
diff --git a/content/shell/shell_content_main.cc b/content/shell/shell_content_main.cc
index 7993198..29ac3ae 100644
--- a/content/shell/shell_content_main.cc
+++ b/content/shell/shell_content_main.cc
@@ -5,7 +5,7 @@
 #include "content/shell/shell_content_main.h"
 
 #include "content/public/app/content_main.h"
-#include "content/shell/shell_main_delegate.h"
+#include "content/shell/app/shell_main_delegate.h"
 
 #if defined(OS_MACOSX)
 int ContentMain(int argc,
diff --git a/content/shell/shell_javascript_dialog_gtk.cc b/content/shell/shell_javascript_dialog_gtk.cc
index 624c222..542048e 100644
--- a/content/shell/shell_javascript_dialog_gtk.cc
+++ b/content/shell/shell_javascript_dialog_gtk.cc
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "content/shell/resource.h"
+#include "content/shell/app/resource.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_javascript_dialog_manager.h"
 
diff --git a/content/shell/shell_javascript_dialog_win.cc b/content/shell/shell_javascript_dialog_win.cc
index e746a57..b8fd981 100644
--- a/content/shell/shell_javascript_dialog_win.cc
+++ b/content/shell/shell_javascript_dialog_win.cc
@@ -5,7 +5,7 @@
 #include "content/shell/shell_javascript_dialog.h"
 
 #include "base/string_util.h"
-#include "content/shell/resource.h"
+#include "content/shell/app/resource.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_javascript_dialog_manager.h"
 
diff --git a/content/shell/shell_mac.mm b/content/shell/shell_mac.mm
index 0e1c582..f4c6789 100644
--- a/content/shell/shell_mac.mm
+++ b/content/shell/shell_mac.mm
@@ -13,7 +13,7 @@
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
-#include "content/shell/resource.h"
+#include "content/shell/app/resource.h"
 #include "googleurl/src/gurl.h"
 #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
 
diff --git a/content/shell/shell_win.cc b/content/shell/shell_win.cc
index de90395..b6e85c6 100644
--- a/content/shell/shell_win.cc
+++ b/content/shell/shell_win.cc
@@ -13,7 +13,7 @@
 #include "base/win/wrapped_window_proc.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
-#include "content/shell/resource.h"
+#include "content/shell/app/resource.h"
 #include "ui/base/win/hwnd_util.h"
 
 namespace {
diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc
index 6b8822a2..d6b7fd11 100644
--- a/content/test/content_browser_test.cc
+++ b/content/test/content_browser_test.cc
@@ -12,12 +12,12 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
+#include "content/shell/app/shell_main_delegate.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/shell_content_renderer_client.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_content_browser_client.h"
-#include "content/shell/shell_main_delegate.h"
 #include "content/test/test_content_client.h"
 
 #if defined(OS_MACOSX)
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 2d294ee..ec0c581 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -11,10 +11,10 @@
 #include "base/test/test_suite.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_test_suite_base.h"
+#include "content/shell/app/shell_main_delegate.h"
 #include "content/shell/common/shell_content_client.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/shell_content_browser_client.h"
-#include "content/shell/shell_main_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_ANDROID)