Revert 215745 "Fix crash when reloading packaged app. "

trunk/src/apps/shell_window.cc

 // Copyright 2013 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 "apps/shell_window.h"
 
 #include "apps/shell_window_geometry_cache.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 262 matching lines @@
                                      bool last_unlocked_by_target) {
   bool has_permission = IsExtensionWithPermissionOrSuggestInConsole(
       APIPermission::kPointerLock,
       extension_,
       web_contents->GetRenderViewHost());
 
   web_contents->GotResponseToLockMouseRequest(has_permission);
 }
 
 void ShellWindow::OnNativeClose() {
-  if (extension_) {
-    // If |extension_| is NULL here, it is because the extension has been
-    // unloaded. In this case, the window will have already been removed from
-    // the ShellWindowRegistry, and the app can not be informed of the window
-    // closing as it has gone.
-    extensions::ShellWindowRegistry::Get(profile_)->RemoveShellWindow(this);
-    if (shell_window_contents_)
-      shell_window_contents_->NativeWindowClosed();
-  }
+  extensions::ShellWindowRegistry::Get(profile_)->RemoveShellWindow(this);
+  if (shell_window_contents_)
+    shell_window_contents_->NativeWindowClosed();
   delete this;
 }
 
 void ShellWindow::OnNativeWindowChanged() {
   SaveWindowPosition();
   if (shell_window_contents_ && native_app_window_)
     shell_window_contents_->NativeWindowChanged(native_app_window_.get());
 }
 
 void ShellWindow::OnNativeWindowActivated() {
@@ skipping 144 matching lines @@
       delegate_->PreferredIconSize(),
       extensions::IconsInfo::GetDefaultAppIcon(),
       this));
 
   // Triggers actual image loading with 1x resources. The 2x resource will
   // be handled by IconImage class when requested.
   app_icon_image_->image_skia().GetRepresentation(ui::SCALE_FACTOR_100P);
 }
 
 void ShellWindow::CloseContents(WebContents* contents) {
-  Close();
+  native_app_window_->Close();
 }
 
 bool ShellWindow::ShouldSuppressDialogs() {
   return true;
 }
 
 content::ColorChooser* ShellWindow::OpenColorChooser(WebContents* web_contents,
                                                      SkColor initial_color) {
   return delegate_->ShowColorChooser(web_contents, initial_color);
 }
@@ skipping 58 matching lines @@
       // TODO(jianli): once http://crbug.com/123007 is fixed, we'll no longer
       // need to make the native window (ShellWindowViews specially) update
       // the clickthrough region for the new RVH.
       native_app_window_->RenderViewHostChanged();
       break;
     }
     case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
       const extensions::Extension* unloaded_extension =
           content::Details<extensions::UnloadedExtensionInfo>(
               details)->extension;
-      if (extension_ == unloaded_extension) {
-        Close();
-        // After this notification finishes processing, the Extension will be
-        // deleted, so we null out our reference to avoid bad access.
-        extension_ = NULL;
-      }
+      if (extension_ == unloaded_extension)
+        native_app_window_->Close();
       break;
     }
     case chrome::NOTIFICATION_APP_TERMINATING:
-      Close();
+      native_app_window_->Close();
       break;
     default:
       NOTREACHED() << "Received unexpected notification";
   }
 }
 
 void ShellWindow::SetWebContentsBlocked(content::WebContents* web_contents,
                                         bool blocked) {
   delegate_->SetWebContentsBlocked(web_contents, blocked);
 }
 
 bool ShellWindow::IsWebContentsVisible(content::WebContents* web_contents) {
   return delegate_->IsWebContentsVisible(web_contents);
 }
 
 extensions::ActiveTabPermissionGranter*
     ShellWindow::GetActiveTabPermissionGranter() {
   // Shell windows don't support the activeTab permission.
   return NULL;
 }
 
 WebContentsModalDialogHost* ShellWindow::GetWebContentsModalDialogHost() {
   return native_app_window_.get();
 }
 
-void ShellWindow::Close() {
-  extensions::ShellWindowRegistry::Get(profile_)->RemoveShellWindow(this);
-  native_app_window_->Close();
-}
-
 void ShellWindow::AddMessageToDevToolsConsole(ConsoleMessageLevel level,
                                               const std::string& message) {
   content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
   rvh->Send(new ExtensionMsg_AddMessageToConsole(
       rvh->GetRoutingID(), level, message));
 }
 
 void ShellWindow::SaveWindowPosition() {
   if (window_key_.empty())
     return;
@@ skipping 56 matching lines @@
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }
 
 }  // namespace apps