"Redirecting URLs to Packaged Apps" implementation: revised

chrome/browser/ui/apps/chrome_shell_window_delegate.cc

Index: chrome/browser/ui/apps/chrome_shell_window_delegate.cc
diff --git a/chrome/browser/ui/apps/chrome_shell_window_delegate.cc b/chrome/browser/ui/apps/chrome_shell_window_delegate.cc
index fe1e234a5ecb4acabeee949146ead63c7728929c..becf2019bfba2b1f8ae0be6c185e85f79d803eb8 100644
--- a/chrome/browser/ui/apps/chrome_shell_window_delegate.cc
+++ b/chrome/browser/ui/apps/chrome_shell_window_delegate.cc
@@ -5,10 +5,12 @@
 #include "chrome/browser/ui/apps/chrome_shell_window_delegate.h"
 
 #include "base/strings/stringprintf.h"
+#include "chrome/browser/apps/app_url_redirector.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/platform_util.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -62,6 +64,14 @@ void ChromeShellWindowDelegate::DisableExternalOpenForTesting() {
 
 void ChromeShellWindowDelegate::InitWebContents(
     content::WebContents* web_contents) {
+  // We don't want to ever send visited URLs to apps in incognito.
+  // Technically, apps are not supported in incognito, but explicitly check
+  // for that. See b/240879, which tracks incognito support for v2 apps.
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+  if (!profile->IsOffTheRecord())

[not at google - send to devlin, 2013/09/04 15:37:21]

why do you need to intercept navigations from shell windows?

[benwells, 2013/09/04 23:54:20]

Platform apps can navigate which would normally open the link in the users
default browser, if there is an app handler it should be used instead.

[not at google - send to devlin, 2013/09/05 00:01:52]

It seems like there are a whole bunch of other places where you'd need to
intercept navigations from, then. I was assuming that the Navigate method would
catch them all.

[sergeygs, 2013/09/05 09:19:03]

To intercept target=_blank and window.open() navigations in apps. I believe this
was already reviewed and indirectly (by requesting me to move this code from one
class to another) blessed by benwells@.

[sergeygs, 2013/09/05 09:19:03]

Not exactly a whole bunch, according to I found, and I think I was covering them
all, but anyway: this is now obsolete (see the latest patch).

+    AppUrlRedirector::CreateForWebContents(web_contents);
+
   FaviconTabHelper::CreateForWebContents(web_contents);
 
 #if defined(ENABLE_PRINTING)