Move apps/shell to extensions/shell.

extensions/shell/app_shell.gyp

Index: extensions/shell/app_shell.gyp
diff --git a/apps/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
similarity index 96%
rename from apps/shell/app_shell.gyp
rename to extensions/shell/app_shell.gyp
index de0a74dbfc5fd6709c4be1561205bea2dc96664d..d95b38557369273e574130e385057e1948762e6b 100644
--- a/apps/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -15,7 +15,7 @@
           'action_name': 'generate_app_shell_resources',
           'variables': {
             'grit_grd_file': 'app_shell_resources.grd',
-            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/apps/shell',
+            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/extensions/shell',
           },
           'includes': [ '../../build/grit_action.gypi' ],
         },
@@ -43,7 +43,6 @@
           'action_name': 'repack_app_shell_pack',
           'variables': {
             'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/apps/shell/app_shell_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.pak',
               # TODO(jamescook): Extract the extension/app related resources
@@ -53,6 +52,7 @@
               '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/extensions/shell/app_shell_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/extensions/strings/extensions_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
@@ -71,7 +71,6 @@
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
         'app_shell_pak',
-        '<(DEPTH)/apps/shell/common/api/api.gyp:shell_api',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_prefs_test_support',
         '<(DEPTH)/components/components.gyp:omaha_query_params',
@@ -87,6 +86,7 @@
         '<(DEPTH)/extensions/extensions.gyp:extensions_common',
         '<(DEPTH)/extensions/extensions.gyp:extensions_renderer',
         '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources',
+        '<(DEPTH)/extensions/shell/common/api/api.gyp:shell_api',
         '<(DEPTH)/mojo/mojo.gyp:mojo_environment_chromium',
         '<(DEPTH)/mojo/mojo.gyp:mojo_system_impl',
         '<(DEPTH)/skia/skia.gyp:skia',
@@ -97,7 +97,7 @@
       'include_dirs': [
         '../..',
         '<(SHARED_INTERMEDIATE_DIR)',
-        '<(SHARED_INTERMEDIATE_DIR)/apps/shell',
+        '<(SHARED_INTERMEDIATE_DIR)/extensions/shell',
       ],
       'sources': [
         'app/shell_main_delegate.cc',