Pull shell window stuff out of ExtensionHost and put in ShellWindow

chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm

 // 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/cocoa/extensions/shell_window_cocoa.h"
 
 #include "base/sys_string_conversions.h"
-#include "chrome/browser/extensions/extension_host.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/cocoa/browser_window_utils.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
 #include "chrome/common/extensions/extension.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
 #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
 
 @implementation ShellWindowController
 
 @synthesize shellWindow = shellWindow_;
 
 - (void)windowWillClose:(NSNotification*)notification {
   if (shellWindow_)
     shellWindow_->WindowWillClose();
 }
 
 @end
 
-ShellWindowCocoa::ShellWindowCocoa(ExtensionHost* host)
-    : ShellWindow(host),
+ShellWindowCocoa::ShellWindowCocoa(Profile* profile,
+                                   const Extension* extension,
+                                   const GURL& url)
+    : ShellWindow(profile, extension, url),
       attention_request_id_(0) {
   NSRect rect = NSMakeRect(0, 0, kDefaultWidth, kDefaultHeight);
   NSUInteger styleMask = NSTitledWindowMask | NSClosableWindowMask |
                          NSMiniaturizableWindowMask | NSResizableWindowMask;
   scoped_nsobject<NSWindow> window([[UnderlayOpenGLHostingWindow alloc]
       initWithContentRect:rect
                 styleMask:styleMask
                   backing:NSBackingStoreBuffered
                     defer:NO]);
-  [window setTitle:base::SysUTF8ToNSString(host->extension()->name())];
+  [window setTitle:base::SysUTF8ToNSString(extension->name())];
 
-  NSView* view = host->view()->native_view();
+  NSView* view = web_contents()->GetView()->GetNativeView();
   [view setFrame:rect];
   [view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
   [[window contentView] addSubview:view];
 
   window_controller_.reset(
       [[ShellWindowController alloc] initWithWindow:window.release()]);
   [[window_controller_ window] setDelegate:window_controller_];
   [window_controller_ setShellWindow:this];
   [window_controller_ showWindow:nil];
 }
@@ skipping 109 matching lines @@
 }
 
 ShellWindowCocoa::~ShellWindowCocoa() {
 }
 
 NSWindow* ShellWindowCocoa::window() const {
   return [window_controller_ window];
 }
 
 // static
-ShellWindow* ShellWindow::CreateShellWindow(ExtensionHost* host) {
-  return new ShellWindowCocoa(host);
+ShellWindow* ShellWindow::CreateShellWindow(Profile* profile,
+                                            const Extension* extension,
+                                            const GURL& url) {
+  return new ShellWindowCocoa(profile, extension, url);
 }