Fix window.close() in Athena

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/content/content_proxy.h"
 #include "athena/content/media_utils.h"
@@ skipping 352 matching lines @@
     return athena::OpenColorChooser(web_contents, color, suggestions);
   }
 
   // Called when a file selection is to be done.
   virtual void RunFileChooser(
       content::WebContents* web_contents,
       const content::FileChooserParams& params) override {
     return athena::OpenFileChooser(web_contents, params);
   }
 
+  virtual void CloseContents(content::WebContents* contents) override {
+    GetWidget()->Close();

[oshima, 2014/10/16 18:44:48]

This may not delete activity. Does the following work?

Acvitity::Delete(this)

[yoshiki, 2014/10/16 18:49:58]

I'll check whether it works. BTW, should we change L139 as well?

+  }
+
  private:
   void CreateProgressBar() {
     CHECK(!progress_bar_);
     progress_bar_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));
     progress_bar_->SetColor(SkColorSetRGB(0x17, 0x59, 0xcd));
   }
 
   void CreateReloadMessage() {
     CHECK(!reload_message_);
     reload_message_.reset(new views::Widget);
@@ skipping 244 matching lines @@
   if (content_proxy_.get())
     content_proxy_.reset(NULL);
 }
 
 void WebActivity::ShowContentProxy() {
   if (!content_proxy_.get())
     content_proxy_.reset(new ContentProxy(web_view_));
 }
 
 }  // namespace athena