Add minimum Conetxt Menu

athena/main/athena_main.cc

Index: athena/main/athena_main.cc
diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc
index 911776a5ec0313105fc29d029ebdb5eb0deacfc0..586011b2ce308569f9ee133965036ac0b371fc55 100644
--- a/athena/main/athena_main.cc
+++ b/athena/main/athena_main.cc
@@ -4,6 +4,7 @@
 
 #include "athena/content/public/content_activity_factory.h"
 #include "athena/content/public/content_app_model_builder.h"
+#include "athena/content/public/web_contents_view_delegate_creator.h"
 #include "athena/home/public/home_card.h"
 #include "athena/main/athena_app_window_controller.h"
 #include "athena/main/athena_launcher.h"
@@ -30,6 +31,7 @@
 #include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/native_theme/native_theme_switches.h"
 #include "ui/wm/core/visibility_controller.h"
+#include "ui/wm/core/wm_state.h"
 
 namespace {
 
@@ -81,6 +83,8 @@ class AthenaBrowserMainDelegate : public extensions::ShellBrowserMainDelegate {
 
   // extensions::ShellBrowserMainDelegate:
   virtual void Start(content::BrowserContext* context) OVERRIDE {
+    wm_state_.reset(new ::wm::WMState);

[Jun Mukai, 2014/08/07 19:30:59]

I think sadrul has added WMSate to window manager.  Do you really need this
here?

[oshima, 2014/08/07 20:23:07]

I didn't exist when I worked on it. thanks you for the info. removed.

+
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
     // Force showing in the experimental app-list view.
@@ -117,6 +121,7 @@ class AthenaBrowserMainDelegate : public extensions::ShellBrowserMainDelegate {
   virtual void Shutdown() OVERRIDE {
     keyboard_observer_.reset();
     athena::ShutdownAthena();
+    wm_state_.reset();
   }
 
   virtual extensions::ShellDesktopController* CreateDesktopController()
@@ -129,6 +134,8 @@ class AthenaBrowserMainDelegate : public extensions::ShellBrowserMainDelegate {
   }
 
  private:
+  scoped_ptr< ::wm::WMState> wm_state_;
+
   scoped_ptr<VirtualKeyboardObserver> keyboard_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate);
@@ -145,8 +152,7 @@ class AthenaContentBrowserClient
   // content::ContentBrowserClient:
   virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(
       content::WebContents* web_contents) OVERRIDE {
-    // TODO(oshima): Implement athena's WebContentsViewDelegate.
-    return NULL;
+    return athena::CreateWebContentsViewDelegate(web_contents);
   }
 
  private: