Remove TabContents creation from ShellWindow.

chrome/browser/ui/extensions/shell_window.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/extensions/shell_window.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/shell_window_geometry_cache.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/extensions/tab_helper.h"
+#include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/file_select_helper.h"
-#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/intents/web_intents_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/extensions/native_shell_window.h"
 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/view_type_utils.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 58 matching lines @@
                          const extensions::Extension* extension)
     : profile_(profile),
       extension_(extension),
       web_contents_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           extension_function_dispatcher_(profile, this)) {
 }
 
 void ShellWindow::Init(const GURL& url,
                        const ShellWindow::CreateParams& params) {
-  web_contents_ = WebContents::Create(
+  web_contents_.reset(WebContents::Create(
       profile(), SiteInstance::CreateForURL(profile(), url), MSG_ROUTING_NONE,
-      NULL);
-  contents_.reset(TabContents::Factory::CreateTabContents(web_contents_));
-  content::WebContentsObserver::Observe(web_contents_);
+      NULL));
+  ConstrainedWindowTabHelper::CreateForWebContents(web_contents_.get());

[Ben Goodger (Google), 2012/10/22 16:09:50]

qq for apps folk: why is ShellWindow using ConstrainedWindows? this is exactly
the kind of browser feature creep that I wanted to avoid by having the app
frames live outside chrome.

[sail, 2012/11/01 22:22:20]

Hi Ben. I think of ConstrainedWindows as a way to show a modal dialog on top of
web contents.

One way this is used today is that an extension API will make a call that needs
to have a dialog shown. The API is usually associated with a web contents. We
use this web contents to parent the dialog (either on a tab or a shell window).

Does this seem reasonable? 

+  FaviconTabHelper::CreateForWebContents(web_contents_.get());
+  WebIntentPickerController::CreateForWebContents(web_contents_.get());

[Ben Goodger (Google), 2012/10/22 16:09:50]

ditto all of this other stuff.

i'd like to see all of this stuff refactored instead of having the incestuous
pile grow.

+
+  content::WebContentsObserver::Observe(web_contents_.get());
   web_contents_->SetDelegate(this);
-  chrome::SetViewType(web_contents_, chrome::VIEW_TYPE_APP_SHELL);
+  chrome::SetViewType(web_contents_.get(), chrome::VIEW_TYPE_APP_SHELL);
   web_contents_->GetMutableRendererPrefs()->
       browser_handles_all_top_level_requests = true;
   web_contents_->GetRenderViewHost()->SyncRendererPrefs();
 
   native_window_.reset(NativeShellWindow::Create(this, params));
 
   if (!params.window_key.empty()) {
     window_key_ = params.window_key;
 
     if (params.restore_position || params.restore_size) {
@@ skipping 45 matching lines @@
   registrar_.RemoveAll();
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(profile_));
   // Close when the browser is exiting.
   // TODO(mihaip): we probably don't want this in the long run (when platform
   // apps are no longer tied to the browser process).
   registrar_.Add(this, chrome::NOTIFICATION_APP_TERMINATING,
                  content::NotificationService::AllSources());
 
-  // Automatically dismiss all infobars.
-  InfoBarTabHelper* infobar_helper =
-      InfoBarTabHelper::FromWebContents(web_contents_);
-  infobar_helper->set_infobars_enabled(false);
-
   // Prevent the browser process from shutting down while this window is open.
   browser::StartKeepAlive();
 
   UpdateExtensionAppIcon();
 }
 
 ShellWindow::~ShellWindow() {
   // Unregister now to prevent getting NOTIFICATION_APP_TERMINATING if we're the
   // last window open.
   registrar_.RemoveAll();
@@ skipping 174 matching lines @@
   return true;
 }
 
 void ShellWindow::WebIntentDispatch(
     content::WebContents* web_contents,
     content::WebIntentsDispatcher* intents_dispatcher) {
   if (!web_intents::IsWebIntentsEnabledForProfile(profile_))
     return;
 
   WebIntentPickerController* web_intent_picker_controller =
-      WebIntentPickerController::FromWebContents(contents_->web_contents());
+      WebIntentPickerController::FromWebContents(web_contents_.get());
   web_intent_picker_controller->SetIntentsDispatcher(intents_dispatcher);
   web_intent_picker_controller->ShowDialog(
       intents_dispatcher->GetIntent().action,
       intents_dispatcher->GetIntent().type);
 }
 
 void ShellWindow::RunFileChooser(WebContents* tab,
                                  const content::FileChooserParams& params) {
   FileSelectHelper::RunFileChooser(tab, params);
 }
 
 bool ShellWindow::IsPopupOrPanel(const WebContents* source) const {
-  DCHECK(source == web_contents_);
+  DCHECK(source == web_contents_.get());
   return true;
 }
 
 void ShellWindow::MoveContents(WebContents* source, const gfx::Rect& pos) {
-  DCHECK(source == web_contents_);
+  DCHECK(source == web_contents_.get());
   native_window_->SetBounds(pos);
 }
 
 void ShellWindow::NavigationStateChanged(
     const content::WebContents* source, unsigned changed_flags) {
-  DCHECK(source == web_contents_);
+  DCHECK(source == web_contents_.get());
   if (changed_flags & content::INVALIDATE_TYPE_TITLE)
     native_window_->UpdateWindowTitle();
   else if (changed_flags & content::INVALIDATE_TYPE_TAB)
     native_window_->UpdateWindowIcon();
 }
 
 void ShellWindow::ToggleFullscreenModeForTab(content::WebContents* source,
                                              bool enter_fullscreen) {
-  DCHECK(source == web_contents_);
+  DCHECK(source == web_contents_.get());
   native_window_->SetFullscreen(enter_fullscreen);
 }
 
 bool ShellWindow::IsFullscreenForTabOrPending(
     const content::WebContents* source) const {
-  DCHECK(source == web_contents_);
+  DCHECK(source == web_contents_.get());
   return native_window_->IsFullscreenOrPending();
 }
 
 void ShellWindow::Observe(int type,
                           const content::NotificationSource& source,
                           const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED: {
       // TODO(jeremya): once http://crbug.com/123007 is fixed, we'll no longer
       // need to suspend resource requests here (the call in the constructor
@@ skipping 66 matching lines @@
     const extensions::DraggableRegion& region = *iter;
     sk_region->op(
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }