"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..b3fb9f530b8c19fd22189039cab9017f34f59be7 100644
--- a/chrome/browser/ui/browser_tab_contents.cc
+++ b/chrome/browser/ui/browser_tab_contents.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/browser_tab_contents.h"
 
+#include "apps/url_redirector.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
@@ -53,6 +54,7 @@
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/view_type_utils.h"
+#include "extensions/common/switches.h"
 
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
@@ -112,6 +114,12 @@ void BrowserTabContents::AttachTabHelpers(WebContents* web_contents) {
   // helpers may rely on that.
   SessionTabHelper::CreateForWebContents(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)) {
+    apps::UrlRedirector::CreateForWebContents(web_contents);

[benwells, 2013/09/03 01:10:56]

Won't this get called for incognito profiles and hit that CHECK?

[sergeygs, 2013/09/03 06:15:24]

Nice catch here, added an 'if'.

+  }
   AlternateErrorPageTabObserver::CreateForWebContents(web_contents);
   TabAutofillManagerDelegate::CreateForWebContents(web_contents);
   AutofillDriverImpl::CreateForWebContentsAndDelegate(