"Redirecting URLs to Packaged Apps" implementation: revised

chrome/browser/ui/browser_tab_contents.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/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"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/external_protocol/external_protocol_observer.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
 #include "chrome/browser/net/load_time_stats.h"
@@ skipping 87 matching lines @@
 
   // Create all the tab helpers.
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
 
   // SessionTabHelper comes first because it sets up the tab ID, and other
   // 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(
       web_contents,
       TabAutofillManagerDelegate::FromWebContents(web_contents),
       g_browser_process->GetApplicationLocale(),
       AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER);
   BlockedContentTabHelper::CreateForWebContents(web_contents);
   BookmarkTabHelper::CreateForWebContents(web_contents);
   chrome_browser_net::LoadTimeStatsTabHelper::CreateForWebContents(
@@ skipping 64 matching lines @@
                                      NULL)) {
     OneClickSigninHelper::CreateForWebContentsWithPasswordManager(
         web_contents, PasswordManager::FromWebContents(web_contents));
   }
 #endif
 
 #if defined(OS_WIN)
   MetroPinTabHelper::CreateForWebContents(web_contents);
 #endif
 }