don't display platform app resources in normal browser windows

chrome/browser/ui/extensions/shell_window.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/extensions/shell_window.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/shell_window_geometry_cache.h"
@@ skipping 113 matching lines @@
         if (params.restore_position)
           bounds.set_origin(cached_bounds.origin());
         if (params.restore_size)
           bounds.set_size(cached_bounds.size());
 
         native_window_->SetBounds(bounds);
       }
     }
   }
 
-
   // Block the created RVH from loading anything until the background page
   // has had a chance to do any initialization it wants.
   SuspendRenderViewHost(web_contents_->GetRenderViewHost());
 
   // TODO(jeremya): there's a bug where navigating a web contents to an
   // extension URL causes it to create a new RVH and discard the old (perfectly
   // usable) one. To work around this, we watch for a RVH_CHANGED message from
   // the web contents (which will be sent during LoadURL) and suspend resource
   // requests on the new RVH to ensure that we block the new RVH from loading
   // anything. It should be okay to remove the NOTIFICATION_RVH_CHANGED
@@ skipping 62 matching lines @@
     }
   }
 
   callback.Run(devices);
 }
 
 WebContents* ShellWindow::OpenURLFromTab(WebContents* source,
                                          const content::OpenURLParams& params) {
   DCHECK(source == web_contents_);
 
-  if (params.url.host() == extension_->id()) {
-    AddMessageToDevToolsConsole(
-        content::CONSOLE_MESSAGE_LEVEL_ERROR,
-        base::StringPrintf(
-            "Can't navigate to \"%s\"; apps do not support navigation.",
-            params.url.spec().c_str()));
-    return NULL;
-  }
-
   // Don't allow the current tab to be navigated. It would be nice to map all
   // anchor tags (even those without target="_blank") to new tabs, but right
-  // now we can't distinguish between those and <meta> refreshes, which we
-  // don't want to allow.
+  // now we can't distinguish between those and <meta> refreshes or window.href
+  // navigations, which we don't want to allow.
   // TOOD(mihaip): Can we check for user gestures instead?
   WindowOpenDisposition disposition = params.disposition;
   if (disposition == CURRENT_TAB) {
     AddMessageToDevToolsConsole(
         content::CONSOLE_MESSAGE_LEVEL_ERROR,
         base::StringPrintf(
             "Can't open same-window link to \"%s\"; try target=\"_blank\".",
             params.url.spec().c_str()));
     return NULL;
   }
 
   // These dispositions aren't really navigations.
   if (disposition == SUPPRESS_OPEN || disposition == SAVE_TO_DISK ||
       disposition == IGNORE_ACTION) {
     return NULL;
   }
 
   // Force all links to open in a new tab, even if they were trying to open a
   // window.
-  content::OpenURLParams new_tab_params = params;
+  chrome::NavigateParams new_tab_params(
+      static_cast<Browser*>(NULL), params.url, params.transition);
   new_tab_params.disposition =
       disposition == NEW_BACKGROUND_TAB ? disposition : NEW_FOREGROUND_TAB;
-  Browser* browser = browser::FindOrCreateTabbedBrowser(profile_);
-  WebContents* new_tab = browser->OpenURL(new_tab_params);
-  browser->window()->Show();
-  return new_tab;
+  new_tab_params.initiating_profile = profile_;
+  chrome::Navigate(&new_tab_params);
+
+  WebContents* new_contents = new_tab_params.target_contents ?
+      new_tab_params.target_contents->web_contents() : NULL;
+  if (!new_contents) {
+    AddMessageToDevToolsConsole(
+        content::CONSOLE_MESSAGE_LEVEL_ERROR,
+        base::StringPrintf(
+            "Can't navigate to \"%s\"; apps do not support navigation.",
+            params.url.spec().c_str()));
+  }
+
+  return new_contents;
 }
 
 void ShellWindow::AddNewContents(WebContents* source,
                                  WebContents* new_contents,
                                  WindowOpenDisposition disposition,
                                  const gfx::Rect& initial_pos,
                                  bool user_gesture,
                                  bool* was_blocked) {
   DCHECK(source == web_contents_);
   DCHECK(Profile::FromBrowserContext(new_contents->GetBrowserContext()) ==
@@ skipping 189 matching lines @@
   if (window_key_.empty())
     return;
 
   extensions::ShellWindowGeometryCache* cache =
       extensions::ExtensionSystem::Get(profile())->
           shell_window_geometry_cache();
 
   gfx::Rect bounds = native_window_->GetBounds();
   cache->SaveGeometry(extension()->id(), window_key_, bounds);
 }