Get rid of extensions dependency from content\browser.

chrome/browser/ui/browser_navigator.cc

 // Copyright (c) 2011 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_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_url_handler.h"
 #include "chrome/browser/browser_window.h"
+#include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/site_instance.h"
@@ skipping 152 matching lines @@
       // Find a compatible window and re-execute this command in it. Otherwise
       // re-run with NEW_WINDOW.
       if (profile)
         return GetOrCreateBrowser(profile);
       return NULL;
     case NEW_POPUP: {
       // Make a new popup window. Coerce app-style if |params->browser| or the
       // |source| represents an app.
       Browser::Type type = Browser::TYPE_POPUP;
       if ((params->browser && (params->browser->type() & Browser::TYPE_APP)) ||
-          (params->source_contents && params->source_contents->is_app())) {
+          (params->source_contents &&
+           params->source_contents->extension_tab_helper()->is_app())) {
         type = Browser::TYPE_APP_POPUP;
       }
       if (profile) {
         Browser* browser = new Browser(type, profile);
         browser->set_override_bounds(params->window_bounds);
         browser->InitBrowserWindow();
         return browser;
       }
       return NULL;
     }
@@ skipping 221 matching lines @@
       params->target_contents =
           Browser::TabContentsFactory(
               params->browser->profile(),
               GetSiteInstance(source_contents, params->browser->profile(), url),
               MSG_ROUTING_NONE,
               source_contents,
               NULL);
       // This function takes ownership of |params->target_contents| until it
       // is added to a TabStripModel.
       target_contents_owner.TakeOwnership();
-      params->target_contents->SetExtensionAppById(params->extension_app_id);
+      params->target_contents->extension_tab_helper()->
+          SetExtensionAppById(params->extension_app_id);
       // TODO(sky): figure out why this is needed. Without it we seem to get
       // failures in startup tests.
       // By default, content believes it is not hidden.  When adding contents
       // in the background, tell it that it's hidden.
       if ((params->tabstrip_add_types & TabStripModel::ADD_SELECTED) == 0) {
         // TabStripModel::AddTabContents invokes HideContents if not foreground.
         params->target_contents->tab_contents()->WasHidden();
       }
     } else {
       // ... otherwise if we're loading in the current tab, the target is the
@@ skipping 48 matching lines @@
           params->url, params->referrer, params->transition);
     }
 
     // If the singleton tab isn't already selected, select it.
     if (params->source_contents != params->target_contents)
       params->browser->SelectTabContentsAt(singleton_index, user_initiated);
   }
 }
 
 }  // namespace browser