"Redirecting URLs to Packaged Apps" implementation: revised

chrome/browser/ui/browser_tab_contents.cc

Index: chrome/browser/ui/browser_tab_contents.cc
diff --git a/chrome/browser/ui/browser_tab_contents.cc b/chrome/browser/ui/browser_tab_contents.cc
index 6697a950bbbd016f379fee858b43054ce9fb502c..c943dc55397d6285a6ab78615e77a30cc1d6392d 100644
--- a/chrome/browser/ui/browser_tab_contents.cc
+++ b/chrome/browser/ui/browser_tab_contents.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ui/browser_tab_contents.h"
 
-#include "base/command_line.h"
+#include "chrome/browser/apps/app_url_redirector.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
@@ -112,6 +112,12 @@ void BrowserTabContents::AttachTabHelpers(WebContents* web_contents) {
   // helpers may rely on that.
   SessionTabHelper::CreateForWebContents(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.

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

Nit: crbug.com/ instead of b/. b/ is a different, google internal thing.

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

Done.

+  if (!profile->IsOffTheRecord())
+    AppUrlRedirector::CreateForWebContents(web_contents);
+
   AlternateErrorPageTabObserver::CreateForWebContents(web_contents);
   TabAutofillManagerDelegate::CreateForWebContents(web_contents);
   AutofillDriverImpl::CreateForWebContentsAndDelegate(