Enable touch text selection on Athena

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/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"
@@ skipping 11 matching lines @@
 #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/views/views_delegate.h"
 #include "ui/wm/core/visibility_controller.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
 
@@ skipping 25 matching lines @@
 
  private:
   // extensions::ShellDesktopController:
   virtual wm::FocusRules* CreateFocusRules() OVERRIDE {
     return athena::ScreenManager::CreateFocusRules();
   }
 
   DISALLOW_COPY_AND_ASSIGN(AthenaDesktopController);
 };
 
+class AthenaViewsDelegate : public views::ViewsDelegate {
+ public:
+  AthenaViewsDelegate() {}
+  virtual ~AthenaViewsDelegate() {}
+
+ private:
+  // views::ViewsDelegate:
+  virtual void OnBeforeWidgetInit(
+      views::Widget::InitParams* params,
+      views::internal::NativeWidgetDelegate* delegate) OVERRIDE {
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(AthenaViewsDelegate);
+};
+
 class AthenaBrowserMainDelegate : public extensions::ShellBrowserMainDelegate {
  public:
   AthenaBrowserMainDelegate() {}
   virtual ~AthenaBrowserMainDelegate() {}
 
   // extensions::ShellBrowserMainDelegate:
   virtual void Start(content::BrowserContext* context) OVERRIDE {
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
     // Force showing in the experimental app-list view.
     command_line->AppendSwitch(app_list::switches::kEnableExperimentalAppList);
 
     base::FilePath app_dir = base::FilePath::FromUTF8Unsafe(
         command_line->HasSwitch(extensions::switches::kAppShellAppPath)
             ? command_line->GetSwitchValueNative(
                   extensions::switches::kAppShellAppPath)
             : kDefaultAppPath);
 
     base::FilePath app_absolute_dir = base::MakeAbsoluteFilePath(app_dir);
     if (base::DirectoryExists(app_absolute_dir)) {
       extensions::ShellExtensionSystem* extension_system =
           static_cast<extensions::ShellExtensionSystem*>(
               extensions::ExtensionSystem::Get(context));
       extension_system->LoadApp(app_absolute_dir);
     }
 
+    views::ViewsDelegate::views_delegate = &views_delegate_;

[oshima, 2014/08/01 17:22:11]

can you move this to athena_launcher ?

[mohsen, 2014/08/01 18:44:26]

Done. Please take a look...

+
     athena::StartAthena(
         extensions::ShellDesktopController::instance()->host()->window(),
         new athena::ContentActivityFactory(),
         new athena::ContentAppModelBuilder(context));
     athena::HomeCard::Get()->RegisterSearchProvider(
         new athena::UrlSearchProvider(context));
     athena::VirtualKeyboardManager::Create(context);
     keyboard_observer_.reset(new VirtualKeyboardObserver());
 
     CreateTestPages(context);
     CreateDebugWindow();
   }
 
   virtual void Shutdown() OVERRIDE {
     keyboard_observer_.reset();
     athena::ShutdownAthena();
+
+    views::ViewsDelegate::views_delegate = NULL;
   }
 
   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:
+  AthenaViewsDelegate views_delegate_;
   scoped_ptr<VirtualKeyboardObserver> keyboard_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate);
 };
 
 class AthenaContentBrowserClient
     : public extensions::ShellContentBrowserClient {
  public:
   AthenaContentBrowserClient()
       : extensions::ShellContentBrowserClient(new AthenaBrowserMainDelegate()) {
@@ skipping 59 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);
 }