"Redirecting URLs to Packaged Apps" implementation: revised

chrome/browser/ui/apps/chrome_shell_window_delegate.cc

 // Copyright 2013 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/apps/chrome_shell_window_delegate.h"
 
+#include "apps/url_redirector.h"
+#include "base/command_line.h"
 #include "base/strings/stringprintf.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"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
+#include "extensions/common/switches.h"
 
 #if defined(USE_ASH)
 #include "ash/launcher/launcher_types.h"
 #endif
 
 #if defined(ENABLE_PRINTING)
 #if defined(ENABLE_FULL_PRINTING)
 #include "chrome/browser/printing/print_preview_message_handler.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #else
@@ skipping 24 matching lines @@
 ChromeShellWindowDelegate::ChromeShellWindowDelegate() {}
 
 ChromeShellWindowDelegate::~ChromeShellWindowDelegate() {}
 
 void ChromeShellWindowDelegate::DisableExternalOpenForTesting() {
   disable_external_open_for_testing_ = true;
 }
 
 void ChromeShellWindowDelegate::InitWebContents(
     content::WebContents* web_contents) {
+  // TODO(sergeygs): Remove the 'if' and update includes once url_handlers are
+  // moved out of experimental.
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      extensions::switches::kEnableExperimentalExtensionApis)) {
+    // 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())
+      apps::UrlRedirector::CreateForWebContents(web_contents);
+  }
+
   FaviconTabHelper::CreateForWebContents(web_contents);
 
 #if defined(ENABLE_PRINTING)
 #if defined(ENABLE_FULL_PRINTING)
   printing::PrintViewManager::CreateForWebContents(web_contents);
   printing::PrintPreviewMessageHandler::CreateForWebContents(web_contents);
 #else
   printing::PrintViewManagerBasic::CreateForWebContents(web_contents);
 #endif  // defined(ENABLE_FULL_PRINTING)
 #endif  // defined(ENABLE_PRINTING)
@@ skipping 81 matching lines @@
   if (host) {
     host->Send(new ChromeViewMsg_SetVisuallyDeemphasized(
         host->GetRoutingID(), blocked));
   }
 }
 
 bool ChromeShellWindowDelegate::IsWebContentsVisible(
     content::WebContents* web_contents) {
   return platform_util::IsVisible(web_contents->GetView()->GetNativeView());
 }