Refactor ShellWindow to separate platform-specific code.

chrome/browser/ui/views/extensions/shell_window_views.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/views/extensions/shell_window_views.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/common/extensions/draggable_region.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 286 matching lines @@
   return max_size;
 }
 
 void ShellWindowFrameView::ButtonPressed(views::Button* sender,
                                          const views::Event& event) {
   DCHECK(!window_->frameless());
   if (sender == close_button_)
     frame_->Close();
 }
 
-ShellWindowViews::ShellWindowViews(Profile* profile,
-                                   const extensions::Extension* extension,
-                                   const GURL& url,
+ShellWindowViews::ShellWindowViews(ShellWindow* shell_window,
                                    const ShellWindow::CreateParams& win_params)
-    : ShellWindow(profile, extension, url),
+    : shell_window_(shell_window),
       web_view_(NULL),
       is_fullscreen_(false),
       frameless_(win_params.frame == ShellWindow::CreateParams::FRAME_NONE) {
   window_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.delegate = this;
   params.remove_standard_frame = true;
   minimum_size_ = win_params.minimum_size;
   maximum_size_ = win_params.maximum_size;
   window_->Init(params);
   gfx::Rect window_bounds =
       window_->non_client_view()->GetWindowBoundsForClientBounds(
           win_params.bounds);
   window_->SetBounds(window_bounds);
 #if defined(OS_WIN) && !defined(USE_AURA)
   std::string app_name = web_app::GenerateApplicationNameFromExtensionId(
-      extension->id());
+      extension()->id());
   ui::win::SetAppIdForWindow(
-      ShellIntegration::GetAppModelIdForProfile(UTF8ToWide(app_name),
-                                                profile->GetPath()),
+      ShellIntegration::GetAppModelIdForProfile(
+          UTF8ToWide(app_name), shell_window_->profile()->GetPath()),
       GetWidget()->GetTopLevelWidget()->GetNativeWindow());
 #endif
   OnViewWasResized();
 
   window_->Show();
 }
 
 views::View* ShellWindowViews::GetInitiallyFocusedView() {
   return web_view_;
 }
@@ skipping 108 matching lines @@
 
 void ShellWindowViews::FlashFrame(bool flash) {
   window_->FlashFrame(flash);
 }
 
 bool ShellWindowViews::IsAlwaysOnTop() const {
   return false;
 }
 
 void ShellWindowViews::DeleteDelegate() {
-  OnNativeClose();
+  shell_window_->OnNativeClose();
 }
 
 bool ShellWindowViews::CanResize() const {
   return true;
 }
 
 bool ShellWindowViews::CanMaximize() const {
   return true;
 }
 
 views::View* ShellWindowViews::GetContentsView() {
   return this;
 }
 
 views::NonClientFrameView* ShellWindowViews::CreateNonClientFrameView(
     views::Widget* widget) {
   ShellWindowFrameView* frame_view = new ShellWindowFrameView(this);
   frame_view->Init(window_);
   return frame_view;
 }
 
 string16 ShellWindowViews::GetWindowTitle() const {
-  return GetTitle();
+  return shell_window_->GetTitle();
 }
 
 views::Widget* ShellWindowViews::GetWidget() {
   return window_;
 }
 
 const views::Widget* ShellWindowViews::GetWidget() const {
   return window_;
 }
 
@@ skipping 37 matching lines @@
     if (!window_->IsMaximized()) {
       if (frameless_)
         rgn->op(0, 0, width, kResizeInsideBoundsSize, SkRegion::kUnion_Op);
       rgn->op(0, 0, kResizeInsideBoundsSize, height, SkRegion::kUnion_Op);
       rgn->op(width - kResizeInsideBoundsSize, 0, width, height,
           SkRegion::kUnion_Op);
       rgn->op(0, height - kResizeInsideBoundsSize, width, height,
           SkRegion::kUnion_Op);
     }
   }
-  web_contents()->GetRenderViewHost()->GetView()->SetClickthroughRegion(rgn);
+  if (web_contents()->GetRenderViewHost()->GetView())
+    web_contents()->GetRenderViewHost()->GetView()->SetClickthroughRegion(rgn);
 #endif
 }
 
 void ShellWindowViews::Layout() {
   DCHECK(web_view_);
   web_view_->SetBounds(0, 0, width(), height());
   OnViewWasResized();
 }
 
 void ShellWindowViews::UpdateWindowTitle() {
@@ skipping 23 matching lines @@
                          region.bounds.right(),
                          region.bounds.bottom(),
                          SkRegion::kDifference_Op);
   }
 
   draggable_region_.Set(draggable_region);
   OnViewWasResized();
 }
 
 // static
-ShellWindow* ShellWindow::CreateImpl(Profile* profile,
-                                     const extensions::Extension* extension,
-                                     const GURL& url,
-                                     const ShellWindow::CreateParams& params) {
-  return new ShellWindowViews(profile, extension, url, params);
+NativeShellWindow* NativeShellWindow::Create(
+    ShellWindow* shell_window, const ShellWindow::CreateParams& params) {
+  return new ShellWindowViews(shell_window, params);
 }