Allow closing root window, or pressing the power button to shutdown ash_shell,...

Allow closing root window, or pressing the power button to shutdown ash_shell, and chrome /w chromeos flag (not running on chromeos) to exit the application


BUG=113123


Review URL: https://chromiumcodereview.appspot.com/10825191

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

ash/system/status_area_widget.cc

@@ -131,7 +131,9 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
     caps_lock_enabled_ = enabled;
   }
 
-  virtual void ShutDown() OVERRIDE {}
+  virtual void ShutDown() OVERRIDE {
+    MessageLoop::current()->Quit();
+  }
 
   virtual void SignOut() OVERRIDE {
     MessageLoop::current()->Quit();

ash/wm/power_button_controller.cc

@@ -6,6 +6,7 @@
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
+#include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/cursor_manager.h"
 #include "base/command_line.h"
@@ -472,6 +473,12 @@ void PowerButtonController::OnRootWindowResized(const aura::RootWindow* root,
     background_layer_->SetBounds(gfx::Rect(root->bounds().size()));
 }
 
+void PowerButtonController::OnRootWindowHostCloseRequested(
+                                                const aura::RootWindow*) {
+  if(Shell::GetInstance() && Shell::GetInstance()->delegate())
+    Shell::GetInstance()->delegate()->Exit();
+}
+
 bool PowerButtonController::LoggedInAsNonGuest() const {
   if (login_status_ == user::LOGGED_IN_NONE)
     return false;

ash/wm/power_button_controller.h

@@ -157,6 +157,8 @@ class ASH_EXPORT PowerButtonController : public aura::RootWindowObserver,
   // aura::RootWindowObserver overrides:
   virtual void OnRootWindowResized(const aura::RootWindow* root,
                                    const gfx::Size& old_size) OVERRIDE;
+  virtual void OnRootWindowHostCloseRequested(
+                                   const aura::RootWindow* root) OVERRIDE;
 
   // ShellObserver overrides:
   virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE;

chrome/browser/chromeos/system/ash_system_tray_delegate.cc

@@ -355,6 +355,8 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
 
   virtual void ShutDown() OVERRIDE {
     DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown();
+    if (!base::chromeos::IsRunningOnChromeOS())
+      browser::AttemptUserExit();
   }
 
   virtual void SignOut() OVERRIDE {

ui/aura/root_window.cc

@@ -338,9 +338,9 @@ void RootWindow::OnKeyboardMappingChanged() {
                     OnKeyboardMappingChanged(this));
 }
 
-void RootWindow::OnRootWindowHostClosed() {
+void RootWindow::OnRootWindowHostCloseRequested() {
   FOR_EACH_OBSERVER(RootWindowObserver, observers_,
-                    OnRootWindowHostClosed(this));
+                    OnRootWindowHostCloseRequested(this));
 }
 
 void RootWindow::AddRootWindowObserver(RootWindowObserver* observer) {

ui/aura/root_window.h

@@ -167,7 +167,7 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
   void OnKeyboardMappingChanged();
 
   // The system windowing system has sent a request that we close our window.
-  void OnRootWindowHostClosed();
+  void OnRootWindowHostCloseRequested();
 
   // Add/remove observer. There is no need to remove the observer if
   // the root window is being deleted. In particular, you SHOULD NOT remove

ui/aura/root_window_host_linux.cc

@@ -714,7 +714,7 @@ bool RootWindowHostLinux::Dispatch(const base::NativeEvent& event) {
       Atom message_type = static_cast<Atom>(xev->xclient.data.l[0]);
       if (message_type == atom_cache_.GetAtom("WM_DELETE_WINDOW")) {
         // We have received a close message from the window manager.
-        delegate_->AsRootWindow()->OnRootWindowHostClosed();
+        delegate_->AsRootWindow()->OnRootWindowHostCloseRequested();
       } else if (message_type == atom_cache_.GetAtom("_NET_WM_PING")) {
         XEvent reply_event = *xev;
         reply_event.xclient.window = x_root_window_;

ui/aura/root_window_observer.h

@@ -23,7 +23,7 @@ class AURA_EXPORT RootWindowObserver {
 
   // Invoked when the native windowing system sends us a request to close our
   // window.
-  virtual void OnRootWindowHostClosed(const RootWindow* root) {}
+  virtual void OnRootWindowHostCloseRequested(const RootWindow* root) {}
 
   // Invoked when the keyboard mapping has changed.
   virtual void OnKeyboardMappingChanged(const RootWindow* root) {}

ui/views/widget/desktop_native_widget_helper_aura.cc

@@ -242,7 +242,7 @@ void DesktopNativeWidgetHelperAura::OnRootWindowResized(
                                root->GetHostSize()));
 }
 
-void DesktopNativeWidgetHelperAura::OnRootWindowHostClosed(
+void DesktopNativeWidgetHelperAura::OnRootWindowHostCloseRequested(
     const aura::RootWindow* root) {
   DCHECK_EQ(root, root_window_.get());
   widget_->GetWidget()->Close();

ui/views/widget/desktop_native_widget_helper_aura.h

@@ -62,7 +62,8 @@ class VIEWS_EXPORT DesktopNativeWidgetHelperAura
   // Overridden from aura::RootWindowObserver:
   virtual void OnRootWindowResized(const aura::RootWindow* root,
                                    const gfx::Size& old_size) OVERRIDE;
-  virtual void OnRootWindowHostClosed(const aura::RootWindow* root) OVERRIDE;
+  virtual void OnRootWindowHostCloseRequested(
+                                   const aura::RootWindow* root) OVERRIDE;
 
  private:
   // A weak pointer back to our owning widget.