Delete activity upon window deletion

athena/content/web_activity.cc

 // Copyright 2014 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 "athena/content/web_activity.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/input/public/accelerator_manager.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget.h"
 
 namespace athena {
 namespace {
 
 class WebActivityController : public AcceleratorHandler {
  public:
   enum Command {
     CMD_BACK,
     CMD_FORWARD,
     CMD_RELOAD,
     CMD_RELOAD_IGNORE_CACHE,
+    CMD_CLOSE,
   };
 
   explicit WebActivityController(views::WebView* web_view)
       : web_view_(web_view), reserved_accelerator_enabled_(true) {}
   virtual ~WebActivityController() {}
 
   // Installs accelerators for web activity.
   void InstallAccelerators() {
     accelerator_manager_ = AcceleratorManager::CreateForFocusManager(
                                web_view_->GetFocusManager()).Pass();
     const AcceleratorData accelerator_data[] = {
         {TRIGGER_ON_PRESS, ui::VKEY_R, ui::EF_CONTROL_DOWN, CMD_RELOAD,
          AF_NONE},
         {TRIGGER_ON_PRESS, ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, CMD_RELOAD,
          AF_NONE},
         {TRIGGER_ON_PRESS, ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN,
          CMD_RELOAD_IGNORE_CACHE, AF_NONE},
         {TRIGGER_ON_PRESS, ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, CMD_FORWARD,
          AF_NONE},
         {TRIGGER_ON_PRESS, ui::VKEY_BROWSER_BACK, ui::EF_NONE, CMD_BACK,
          AF_NONE},
+        {TRIGGER_ON_PRESS, ui::VKEY_W, ui::EF_CONTROL_DOWN, CMD_CLOSE, AF_NONE},
     };
     accelerator_manager_->RegisterAccelerators(
         accelerator_data, arraysize(accelerator_data), this);
   }
 
   // Methods that are called before and after key events are consumed by the web
   // contents.
   // See the documentation in WebContentsDelegate: for more details.
   bool PreHandleKeyboardEvent(content::WebContents* source,
                               const content::NativeWebKeyboardEvent& event,
@@ skipping 17 matching lines @@
                            const content::NativeWebKeyboardEvent& event) {
     unhandled_keyboard_event_handler_.HandleKeyboardEvent(
         event, web_view_->GetFocusManager());
   }
 
  private:
   // AcceleratorHandler:
   virtual bool IsCommandEnabled(int command_id) const OVERRIDE {
     switch (command_id) {
       case CMD_RELOAD:
+      case CMD_RELOAD_IGNORE_CACHE:
         return true;
       case CMD_BACK:
         return web_view_->GetWebContents()->GetController().CanGoBack();
       case CMD_FORWARD:
         return web_view_->GetWebContents()->GetController().CanGoForward();
+      case CMD_CLOSE:
+        // TODO(oshima): check onbeforeunload handler.
+        return true;
     }
     return false;
   }
 
   virtual bool OnAcceleratorFired(int command_id,
                                   const ui::Accelerator& accelerator) OVERRIDE {
     switch (command_id) {
       case CMD_RELOAD:
         web_view_->GetWebContents()->GetController().Reload(false);
         return true;
       case CMD_RELOAD_IGNORE_CACHE:
         web_view_->GetWebContents()->GetController().ReloadIgnoringCache(false);
         return true;
       case CMD_BACK:
         web_view_->GetWebContents()->GetController().GoBack();
         return true;
       case CMD_FORWARD:
         web_view_->GetWebContents()->GetController().GoForward();
         return true;
+      case CMD_CLOSE:
+        web_view_->GetWidget()->Close();
+        return true;
     }
     return false;
   }
 
   views::WebView* web_view_;
   bool reserved_accelerator_enabled_;
   scoped_ptr<AcceleratorManager> accelerator_manager_;
   views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(WebActivityController);
@@ skipping 276 matching lines @@
 void WebActivity::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
   ActivityManager::Get()->UpdateActivity(this);
 }
 
 void WebActivity::DidChangeThemeColor(SkColor theme_color) {
   title_color_ = theme_color;
 }
 
 }  // namespace athena