"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 "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"
 #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"
@@ skipping 29 matching lines @@
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #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"
 #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 39 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);
 
+  // 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(
       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
 }