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 192 matching lines @@
     devices.push_back(iter->second[0]);
   }
 
   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

[Evan Stade, 2012/09/06 18:29:52]

you can view this change as a proposal. Here is a brief summary:

GOOD: all kinds of anchor links open a new tab in a browser
GOOD: normal anchor links to app resources throw an error and do nothing
BAD: target="_blank" anchor links to app resources open a new about:blank tab in
a browser window and do not throw an error
GOOD: meta refresh fails
MEH: meta redirect works if the url is valid
BAD: meta redirect creates the about:blank tab if the URL is app resource

note that even the BADs are better than the current behavior (which is to
actually load the app resource in the browser).

[Mihai Parparita -not on Chrome, 2012/09/06 18:40:35]

This seems OK to me. To make it more obvious in the BAD cases that the behavior
is intentional, could the URL be rewritten to chrome-extension://invalid/ (what
we for for extension resources that are not web accessible), instead of dropping
the navigation on the floor?

-  // 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.
-  // 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) {
   DCHECK(source == web_contents_);
   DCHECK(Profile::FromBrowserContext(new_contents->GetBrowserContext()) ==
       profile_);
@@ skipping 159 matching lines @@
     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);
 }