Revert 214844 "Fix crash when reloading packaged app. "

I believe it's causing AppShimQuitTest.QuitWithKeyEvent test to crash.

It was recently added in r214672 and your try runs didn't get a chance to try it before your patch landed.

> Fix crash when reloading packaged app. 
> 
> When a shell window was closed, it wasn't removed from the registry immediately 
> (it was removed in a callback from OnNativeClose, which happens a bit later.) 
> This meant that when the app was loaded again, the window was still in the 
> registry with a stale pointer to the old extension. ExtensionSettingsHandler 
> was tickling this by iterating shell windows on extension load.
> 
> BUG=174250
> TEST=On chromeos, enable the 'Enable debugging for packed apps.' flag. Then
> open chrome://extensions. Then open a packaged app, and reload it. Chrome
> should not crash.
> 
> Review URL: https://chromiumcodereview.appspot.com/20243003

TBR=benwells@chromium.org

Review URL: https://codereview.chromium.org/20534003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214882 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 5 deletions

diff --git a/apps/shell_window.h b/apps/shell_window.h
index 6d803f2..5e449df 100644
--- a/apps/shell_window.h
+++ b/apps/shell_window.h
@@ -179,6 +179,7 @@ class ShellWindow : public content::NotificationObserver,
             ShellWindowContents* shell_window_contents,
             const CreateParams& params);
 
+
   const std::string& window_key() const { return window_key_; }
   const SessionID& session_id() const { return session_id_; }
   const extensions::Extension* extension() const { return extension_; }
@@ -296,11 +297,6 @@ class ShellWindow : public content::NotificationObserver,
   virtual bool IsWebContentsVisible(
       content::WebContents* web_contents) OVERRIDE;
 
-  // Remove the window from the ShellWindowRegistry and tell the native
-  // window to close. The native window won't be actually closed until
-  // OnNativeClose().
-  void Close();
-
   // Helper method to add a message to the renderer's DevTools console.
   void AddMessageToDevToolsConsole(content::ConsoleMessageLevel level,
                                    const std::string& message);