Add support for managing active state of platform apps

chrome/browser/ui/extensions/shell_window.cc

Index: chrome/browser/ui/extensions/shell_window.cc
diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc
index 69cf956cab94d1b3702952ba45f29e873daa203a..b57ab3e9fa3aa50f6ed25e2f95c0138ed1bd8425 100644
--- a/chrome/browser/ui/extensions/shell_window.cc
+++ b/chrome/browser/ui/extensions/shell_window.cc
@@ -49,7 +49,10 @@ ShellWindow* ShellWindow::Create(Profile* profile,
                                  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,
@@ -88,8 +91,6 @@ ShellWindow::ShellWindow(Profile* profile,
 
   // Prevent the browser process from shutting down while this window is open.
   browser::StartKeepAlive();
-
-  ShellWindowRegistry::Get(profile_)->AddShellWindow(this);
 }
 
 ShellWindow::~ShellWindow() {
@@ -97,8 +98,6 @@ ShellWindow::~ShellWindow() {
   // last window open.
   registrar_.RemoveAll();
 
-  ShellWindowRegistry::Get(profile_)->RemoveShellWindow(this);
-
   // Remove shutdown prevention.
   browser::EndKeepAlive();
 }
@@ -107,11 +106,17 @@ bool ShellWindow::IsFullscreenOrPending() const {
   return false;
 }
 
+void ShellWindow::OnNativeClose() {
+  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();
 }