Add support for managing active state of platform apps

chrome/browser/ui/extensions/shell_window.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/extensions/shell_window.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/file_select_helper.h"
@@ skipping 31 matching lines @@
 ShellWindow::CreateParams::CreateParams()
   : frame(ShellWindow::CreateParams::FRAME_CHROME),
     bounds(10, 10, kDefaultWidth, kDefaultHeight) {
 }
 
 ShellWindow* ShellWindow::Create(Profile* profile,
                                  const extensions::Extension* extension,
                                  const GURL& url,
                                  const ShellWindow::CreateParams params) {
   // This object will delete itself when the window is closed.
-  return ShellWindow::CreateImpl(profile, extension, url, params);
+  ShellWindow* window =
+      ShellWindow::CreateImpl(profile, extension, url, params);
+  ShellWindowRegistry::Get(profile)->AddShellWindow(window);
+  return window;
 }
 
 ShellWindow::ShellWindow(Profile* profile,
                          const extensions::Extension* extension,
                          const GURL& url)
     : profile_(profile),
       extension_(extension),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           extension_function_dispatcher_(profile, this)) {
   // TODO(jeremya) this should all be done in an Init() method, not in the
@@ skipping 18 matching lines @@
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(profile_));
   // Close when the browser is exiting.
   // TODO(mihaip): we probably don't want this in the long run (when platform
   // apps are no longer tied to the browser process).
   registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING,
                  content::NotificationService::AllSources());
 
   // Prevent the browser process from shutting down while this window is open.
   browser::StartKeepAlive();
-
-  ShellWindowRegistry::Get(profile_)->AddShellWindow(this);
 }
 
 ShellWindow::~ShellWindow() {
   // Unregister now to prevent getting NOTIFICATION_APP_TERMINATING if we're the
   // last window open.
   registrar_.RemoveAll();
 
-  ShellWindowRegistry::Get(profile_)->RemoveShellWindow(this);
-
   // Remove shutdown prevention.
   browser::EndKeepAlive();
 }
 
 bool ShellWindow::IsFullscreenOrPending() const {
   return false;
 }
 
+void ShellWindow::OnNativeClose() {

[Mihai Parparita -not on Chrome, 2012/06/13 20:10:13]

Not sure I understand the rationale behind adding OnNativeClose (and moving the
ShellWindowRegistry update to here). It doesn't seem to be called from anywhere
but the ShellWindowViews subclass. Also, it's easy to forget to call it (e.g.
ShellWindowGtk::Close still uses "delete this").

[DaveMoore, 2012/06/13 20:20:28]

The reason is that if you call RemoveShellWindow from the destructor you will
only have access to ShellWindow's state, and not that of the subclasses. The
fact that it's not called from ShellWindowGtk is an oversite.

On 2012/06/13 20:10:13, Mihai Parparita wrote:

+  ShellWindowRegistry::Get(profile_)->RemoveShellWindow(this);
+  delete this;
+}
+
 string16 ShellWindow::GetTitle() const {
   // WebContents::GetTitle() will return the page's URL if there's no <title>
   // specified. However, we'd prefer to show the name of the extension in that
   // case, so we directly inspect the NavigationEntry's title.
-  if (web_contents()->GetController().GetActiveEntry()->GetTitle().empty())
+  if (!web_contents()->GetController().GetActiveEntry() ||
+      web_contents()->GetController().GetActiveEntry()->GetTitle().empty())
     return UTF8ToUTF16(extension()->name());
   return web_contents()->GetTitle();
 }
 
 bool ShellWindow::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ShellWindow, message)
     IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ skipping 76 matching lines @@
 }
 
 ExtensionWindowController* ShellWindow::GetExtensionWindowController() const {
   return NULL;
 }
 
 void ShellWindow::OnRequest(const ExtensionHostMsg_Request_Params& params) {
   extension_function_dispatcher_.Dispatch(params,
                                           web_contents_->GetRenderViewHost());
 }