Remove TabContents creation from ShellWindow.

chrome/browser/ui/extensions/shell_window.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/base_window.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/console_message_level.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 
 class GURL;
 class Profile;
-class TabContents;
 class NativeShellWindow;
 
 namespace content {
 class WebContents;
 }
 
 namespace extensions {
 class Extension;
 class PlatformAppBrowserTest;
 class WindowController;
@@ skipping 42 matching lines @@
                              const CreateParams& params);
 
   // Convert draggable regions in raw format to SkRegion format. Caller is
   // responsible for deleting the returned SkRegion instance.
   static SkRegion* RawDraggableRegionsToSkRegion(
       const std::vector<extensions::DraggableRegion>& regions);
 
   const std::string& window_key() const { return window_key_; }
   const SessionID& session_id() const { return session_id_; }
   const extensions::Extension* extension() const { return extension_; }
-  TabContents* tab_contents() const { return contents_.get(); }
-  content::WebContents* web_contents() const { return web_contents_; }
+  content::WebContents* web_contents() const { return web_contents_.get(); }
   Profile* profile() const { return profile_; }
   const gfx::Image& app_icon() const { return app_icon_; }
 
   BaseWindow* GetBaseWindow();
   gfx::NativeWindow GetNativeWindow() {
     return GetBaseWindow()->GetNativeWindow();
   }
 
   // NativeShellWindows should call this to determine what the window's title
   // is on startup and from within UpdateWindowTitle().
@@ skipping 91 matching lines @@
 
   Profile* profile_;  // weak pointer - owned by ProfileManager.
   // weak pointer - owned by ExtensionService.
   const extensions::Extension* extension_;
 
   // Identifier that is used when saving and restoring geometry for this
   // window.
   std::string window_key_;
 
   const SessionID session_id_;
-  scoped_ptr<TabContents> contents_;
-  // web_contents_ is owned by contents_.
-  content::WebContents* web_contents_;
+  scoped_ptr<content::WebContents> web_contents_;
   content::NotificationRegistrar registrar_;
   ExtensionFunctionDispatcher extension_function_dispatcher_;
 
   // Icon showed in the task bar.
   gfx::Image app_icon_;
 
   // Used for loading app_icon_.
   scoped_ptr<ImageLoadingTracker> app_icon_loader_;
 
   scoped_ptr<NativeShellWindow> native_window_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindow);
 };
 
 #endif  // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_