When the browser doesn't have connectivity to a hosted app, display a prettier error page by default.

TEST=none
BUG=41281

Review URL: http://codereview.chromium.org/3174024

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

5 files changed, 6 insertions, 18 deletions

diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 2062b10..1ca01cc 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -115,16 +115,4 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) {
             browser()->GetTabContentsAt(2)->render_view_host()->process());
   EXPECT_EQ(host->process(),
             browser()->GetTabContentsAt(3)->render_view_host()->process());
-
-  // Navigate the non-app tab into the browse extent. It should not enter the
-  // app process.
-  // Navigate the app tab into the browse extent. It should stay in the app
-  // process.
-  const GURL& browse_url(base_url.Resolve("path4/empty.html"));
-  NavigateTabHelper(browser()->GetTabContentsAt(2), browse_url);
-  NavigateTabHelper(browser()->GetTabContentsAt(3), browse_url);
-  EXPECT_NE(host->process(),
-            browser()->GetTabContentsAt(2)->render_view_host()->process());
-  EXPECT_EQ(host->process(),
-            browser()->GetTabContentsAt(3)->render_view_host()->process());
 }
diff --git a/chrome/browser/extensions/extension_dom_ui.cc b/chrome/browser/extensions/extension_dom_ui.cc
index c9560cf..1315330 100644
--- a/chrome/browser/extensions/extension_dom_ui.cc
+++ b/chrome/browser/extensions/extension_dom_ui.cc
@@ -71,7 +71,7 @@ class ExtensionDOMUIImageLoadingTracker : public ImageLoadingTracker::Observer {
   void Init() {
     if (extension_) {
       ExtensionResource icon_resource =
-          extension_->GetIconPath(Extension::EXTENSION_ICON_BITTY);
+          extension_->GetIconResource(Extension::EXTENSION_ICON_BITTY);
 
       tracker_.LoadImage(extension_, icon_resource,
                          gfx::Size(kFavIconSize, kFavIconSize),
diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc
index 1e3befc..ecdca47 100644
--- a/chrome/browser/extensions/extension_icon_manager.cc
+++ b/chrome/browser/extensions/extension_icon_manager.cc
@@ -23,8 +23,8 @@ ExtensionIconManager::ExtensionIconManager()
 
 void ExtensionIconManager::LoadIcon(Extension* extension) {
   ExtensionResource icon_resource;
-  extension->GetIconPathAllowLargerSize(&icon_resource,
-                                        Extension::EXTENSION_ICON_BITTY);
+  extension->GetIconResourceAllowLargerSize(&icon_resource,
+                                            Extension::EXTENSION_ICON_BITTY);
   if (!icon_resource.extension_root().empty()) {
     image_tracker_.LoadImage(extension,
                              icon_resource,
diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc
index 741e58a..4586cce 100644
--- a/chrome/browser/extensions/extension_install_ui.cc
+++ b/chrome/browser/extensions/extension_install_ui.cc
@@ -354,7 +354,7 @@ void ExtensionInstallUI::ShowConfirmation(PromptType prompt_type) {
   // Load the image asynchronously. For the response, check OnImageLoaded.
   prompt_type_ = prompt_type;
   ExtensionResource image =
-      extension_->GetIconPath(Extension::EXTENSION_ICON_LARGE);
+      extension_->GetIconResource(Extension::EXTENSION_ICON_LARGE);
   tracker_.LoadImage(extension_, image,
                      gfx::Size(Extension::EXTENSION_ICON_LARGE,
                                Extension::EXTENSION_ICON_LARGE),
diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc
index 7522838..6c5d329 100644
--- a/chrome/browser/extensions/image_loading_tracker_unittest.cc
+++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc
@@ -102,7 +102,7 @@ TEST_F(ImageLoadingTrackerTest, Cache) {
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource image_resource =
-      extension->GetIconPath(Extension::EXTENSION_ICON_SMALLISH);
+      extension->GetIconResource(Extension::EXTENSION_ICON_SMALLISH);
   gfx::Size max_size(Extension::EXTENSION_ICON_SMALLISH,
                      Extension::EXTENSION_ICON_SMALLISH);
   ImageLoadingTracker loader(static_cast<ImageLoadingTracker::Observer*>(this));
@@ -148,7 +148,7 @@ TEST_F(ImageLoadingTrackerTest, DeleteExtensionWhileWaitingForCache) {
   ASSERT_TRUE(extension.get() != NULL);
 
   ExtensionResource image_resource =
-      extension->GetIconPath(Extension::EXTENSION_ICON_SMALLISH);
+      extension->GetIconResource(Extension::EXTENSION_ICON_SMALLISH);
   ImageLoadingTracker loader(static_cast<ImageLoadingTracker::Observer*>(this));
   loader.LoadImage(extension.get(),
                    image_resource,