Add minimum Conetxt Menu

athena/main/athena_main.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/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"
 #include "athena/main/debug/debug_window.h"
 #include "athena/main/placeholder.h"
 #include "athena/main/url_search_provider.h"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "content/public/app/content_main.h"
 #include "extensions/shell/app/shell_main_delegate.h"
 #include "extensions/shell/browser/shell_browser_main_delegate.h"
 #include "extensions/shell/browser/shell_content_browser_client.h"
 #include "extensions/shell/browser/shell_desktop_controller.h"
 #include "extensions/shell/browser/shell_extension_system.h"
 #include "extensions/shell/common/switches.h"
 #include "extensions/shell/renderer/shell_renderer_main_delegate.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/keyboard/keyboard_controller.h"
 #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 {
 
 // We want to load the sample calculator app by default, for a while. Expecting
 // to run athena_main at src/
 const char kDefaultAppPath[] =
     "chrome/common/extensions/docs/examples/apps/calculator/app";
 }  // namespace
 
 // This class observes the change of the virtual keyboard and distribute the
@@ skipping 31 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(AthenaDesktopController);
 };
 
 class AthenaBrowserMainDelegate : public extensions::ShellBrowserMainDelegate {
  public:
   AthenaBrowserMainDelegate() {}
   virtual ~AthenaBrowserMainDelegate() {}
 
   // 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.
     command_line->AppendSwitch(app_list::switches::kEnableExperimentalAppList);
     command_line->AppendSwitch(switches::kEnableOverlayScrollbar);
 
     base::FilePath app_dir = base::FilePath::FromUTF8Unsafe(
         command_line->HasSwitch(extensions::switches::kAppShellAppPath)
             ? command_line->GetSwitchValueNative(
                   extensions::switches::kAppShellAppPath)
@@ skipping 16 matching lines @@
     athena::VirtualKeyboardManager::Create(context);
     keyboard_observer_.reset(new VirtualKeyboardObserver());
 
     CreateTestPages(context);
     CreateDebugWindow();
   }
 
   virtual void Shutdown() OVERRIDE {
     keyboard_observer_.reset();
     athena::ShutdownAthena();
+    wm_state_.reset();
   }
 
   virtual extensions::ShellDesktopController* CreateDesktopController()
       OVERRIDE {
     // TODO(mukai): create Athena's own ShellDesktopController subclass so that
     // it can initialize its own window manager logic.
     extensions::ShellDesktopController* desktop = new AthenaDesktopController();
     desktop->SetAppWindowController(new athena::AthenaAppWindowController());
     return desktop;
   }
 
  private:
+  scoped_ptr< ::wm::WMState> wm_state_;
+
   scoped_ptr<VirtualKeyboardObserver> keyboard_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate);
 };
 
 class AthenaContentBrowserClient
     : public extensions::ShellContentBrowserClient {
  public:
   AthenaContentBrowserClient()
       : extensions::ShellContentBrowserClient(new AthenaBrowserMainDelegate()) {
   }
   virtual ~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:
   DISALLOW_COPY_AND_ASSIGN(AthenaContentBrowserClient);
 };
 
 class AthenaRendererMainDelegate
     : public extensions::ShellRendererMainDelegate {
  public:
   AthenaRendererMainDelegate() {}
@@ skipping 40 matching lines @@
 
 int main(int argc, const char** argv) {
   AthenaMainDelegate delegate;
   content::ContentMainParams params(&delegate);
 
   params.argc = argc;
   params.argv = argv;
 
   return content::ContentMain(params);
 }