Aura: Support hovering restore & close buttons for full screen apps

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 303 matching lines @@
   return true;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, CreateParams:
 
 Browser::CreateParams::CreateParams(Type type, Profile* profile)
     : type(type),
-      profile(profile) {
+      profile(profile),
+      initial_show_state(ui::SHOW_STATE_DEFAULT),
+      is_session_restore(false) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Constructors, Creation, Showing:
 
 Browser::Browser(Type type, Profile* profile)
     : type_(type),
       profile_(profile),
       window_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
@@ skipping 144 matching lines @@
 
 // static
 Browser* Browser::Create(Profile* profile) {
   Browser* browser = new Browser(TYPE_TABBED, profile);
   browser->InitBrowserWindow();
   return browser;
 }
 
 // static
 Browser* Browser::CreateWithParams(const CreateParams& params) {
+  if (!params.app_name.empty())
+    RegisterAppPrefs(params.app_name, params.profile);
+
   Browser* browser = new Browser(params.type, params.profile);
   browser->app_name_ = params.app_name;
   browser->set_override_bounds(params.initial_bounds);
+  browser->set_show_state(params.initial_show_state);
+  browser->set_is_session_restore(params.is_session_restore);
+
   browser->InitBrowserWindow();
   return browser;
 }
 
 // static
 Browser* Browser::CreateForType(Type type, Profile* profile) {
   CreateParams params(type, profile);
   return CreateWithParams(params);
 }
 
 // static
 Browser* Browser::CreateForApp(Type type,
                                const std::string& app_name,
                                const gfx::Rect& window_bounds,
                                Profile* profile) {
   DCHECK(type != TYPE_TABBED);
   DCHECK(!app_name.empty());
 
-  RegisterAppPrefs(app_name, profile);
-
 #if !defined(OS_CHROMEOS) || defined(USE_AURA)
   if (type == TYPE_PANEL &&
       !PanelManager::ShouldUsePanels(
           web_app::GetExtensionIdFromApplicationName(app_name))) {
     type = TYPE_POPUP;
   }
 #if defined(TOOLKIT_GTK)
   // Panels are only supported on a white list of window managers for Linux.
   if (type == TYPE_PANEL) {
     ui::WindowManagerName wm_type = ui::GuessWindowManager();
@@ skipping 449 matching lines @@
   return name;
 }
 
 bool Browser::ShouldSaveWindowPlacement() const {
   switch (type_) {
     case TYPE_TABBED:
       return true;
     case TYPE_POPUP:
       // Only save the window placement of popups if they are restored,
       // or the window belongs to DevTools.
+#if defined USE_AURA
+      if (is_app())
+        return true;
+#endif
       return browser_defaults::kRestorePopups || is_devtools();
     case TYPE_PANEL:
       // Do not save the window placement of panels.
       return false;
     default:
       return false;
   }
 }
 
 void Browser::SaveWindowPlacement(const gfx::Rect& bounds,
@@ skipping 39 matching lines @@
     int x, y;
     if (ParseCommaSeparatedIntegers(str, &x, &y))
       restored_bounds.set_origin(gfx::Point(x, y));
   }
 
   return restored_bounds;
 }
 
 ui::WindowShowState Browser::GetSavedWindowShowState() const {
   // Only tabbed browsers use the command line or preference state.
-  if (!is_type_tabbed())
+  bool return_show_state = !is_type_tabbed();

[sky, 2012/02/24 20:56:04]

nit: how about just show_state. Initially when I saw 1054 I thought it was a
mistake.

[DaveMoore, 2012/02/25 16:54:42]

Done.

+
+#if defined(USE_AURA)
+  // Apps save state on aura.
+  return_show_state &= !is_app();
+#endif
+
+  if (return_show_state)
     return show_state_;
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized))
     return ui::SHOW_STATE_MAXIMIZED;
 
   if (show_state_ != ui::SHOW_STATE_DEFAULT)
     return show_state_;
 
   const DictionaryValue* window_pref =
       profile()->GetPrefs()->GetDictionary(GetWindowPlacementKey().c_str());
@@ skipping 96 matching lines @@
 
   // Don't use GetForProfileIfExisting here, we want to force creation of the
   // session service so that user can restore what was open.
   SessionService* session_service =
       SessionServiceFactory::GetForProfile(profile());
   if (session_service)
     session_service->WindowClosing(session_id());
 
   TabRestoreService* tab_restore_service =
       TabRestoreServiceFactory::GetForProfile(profile());
+
+#if defined(USE_AURA)
+  if (tab_restore_service && is_app())

[sky, 2012/02/24 20:56:04]

Move this into it's own method with the ifdef so that we don't have to worry
about potentially invoking BrowserClosing twice. I'm thinking of something like:

if (ShouldNotifyTabRestoreServiceOnClose())
  tab_restore_service->Brow...

+    tab_restore_service->BrowserClosing(tab_restore_service_delegate());
+#endif
+
   if (tab_restore_service && is_type_tabbed() && tab_count())
     tab_restore_service->BrowserClosing(tab_restore_service_delegate());
 
   // TODO(sky): convert session/tab restore to use notification.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BROWSER_CLOSING,
       content::Source<Browser>(this),
       content::Details<bool>(&exiting));
 
   CloseAllTabs();
@@ skipping 4409 matching lines @@
     params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
     ShowSingletonTabOverwritingNTP(params);
   } else {
     service->ShowLoginDialog();
   }
 }
 
 void Browser::ToggleSpeechInput() {
   GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
 }