[App Shell] Include all chrome-specific resources in app_shell.pak.

With this patch, now app_shell only needs its own app_shell.pak resource
file.

BUG=344974
R=jamescook@chromium.org,tfarina@chromium.org

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

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

4 files changed, 9 insertions, 19 deletions

diff --git a/apps/apps.gypi b/apps/apps.gypi
index 5058bc1..3b780ab 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -105,7 +105,11 @@
           'target_name': 'app_shell_pak',
           'type': 'none',
           'dependencies': [
+            # Need dev-tools related resources in shell_resources.pak and devtools_resources.pak.
             '../content/content_shell_and_tests.gyp:generate_content_shell_resources',
+            '../content/browser/devtools/devtools_resources.gyp:devtools_resources',
+            # Need features JSON files in common_resources.pak.
+            'chrome_resources.gyp:chrome_resources',
           ],
           'variables': {
             'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
@@ -116,6 +120,9 @@
               'variables': {
                 'pak_inputs': [
                   '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
+                  '<(grit_out_dir)/common_resources.pak',
+                  '<(grit_out_dir)/extensions_api_resources.pak',
                 ],
               },
               'inputs': [
@@ -140,9 +147,6 @@
           'dependencies': [
             'app_shell_pak',
             'apps',
-            'chrome_resources.gyp:packed_resources',
-            # For resources.pak for features JSON files.
-            'chrome_resources.gyp:packed_extra_resources',
             'test_support_common',
             '../base/base.gyp:base',
             '../base/base.gyp:base_prefs_test_support',
diff --git a/apps/shell/app/DEPS b/apps/shell/app/DEPS
index 36f09d4..448bb59 100644
--- a/apps/shell/app/DEPS
+++ b/apps/shell/app/DEPS
@@ -1,8 +1,4 @@
 include_rules = [
-  # TODO(jamescook): Remove these. http://crbug.com/305404
-  # Chrome pieces for app_shell bring-up.
-  "+chrome/common/chrome_paths.h",
-
   "+chromeos",
 
   # Override apps/DEPS to be more selective about content includes.
diff --git a/apps/shell/app/shell_main_delegate.cc b/apps/shell/app/shell_main_delegate.cc
index 905ffd5..4c7650a 100644
--- a/apps/shell/app/shell_main_delegate.cc
+++ b/apps/shell/app/shell_main_delegate.cc
@@ -11,7 +11,6 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/common/extension_paths.h"
@@ -50,7 +49,6 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
   content_client_.reset(new ShellContentClient);
   SetContentClient(content_client_.get());
 
-  chrome::RegisterPathProvider();
 #if defined(OS_CHROMEOS)
   chromeos::RegisterPathProvider();
 #endif
@@ -91,17 +89,10 @@ bool ShellMainDelegate::ProcessNeedsResourceBundle(
 void ShellMainDelegate::InitializeResourceBundle() {
   ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
 
-  // The extensions system needs manifest data from the Chrome PAK file.
-  // TODO(jamescook): app_shell needs its own manifest data file.
-  base::FilePath resources_pack_path;
-  PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
-  ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-      resources_pack_path, ui::SCALE_FACTOR_NONE);
   base::FilePath pak_dir;
   PathService::Get(base::DIR_MODULE, &pak_dir);
-  ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-      pak_dir.Append(FILE_PATH_LITERAL("app_shell.pak")),
-      ui::SCALE_FACTOR_NONE);
+  ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+      pak_dir.AppendASCII("app_shell.pak"), ui::SCALE_FACTOR_NONE);
 }
 
 }  // namespace apps
diff --git a/apps/shell/browser/DEPS b/apps/shell/browser/DEPS
index 49c3abf..102bc82 100644
--- a/apps/shell/browser/DEPS
+++ b/apps/shell/browser/DEPS
@@ -3,7 +3,6 @@ include_rules = [
   # Chrome pieces for app_shell bring-up.
   "+chrome/browser/extensions/extension_protocols.h",
   "+chrome/browser/extensions/extension_resource_protocols.h",
-  "+chrome/common/chrome_paths.h",
   "+chrome/common/extensions/features/base_feature_provider.h",
   "+chrome/common/extensions/extension_file_util.h",