Enable native accessible touch support inside of ARC

ash/ash_touch_exploration_manager_chromeos.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 "ash/ash_touch_exploration_manager_chromeos.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
+#include "ash/shared/app_types.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "chromeos/audio/chromeos_sounds.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/chromeos_switches.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/chromeos/touch_exploration_controller.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
 AshTouchExplorationManager::AshTouchExplorationManager(
     RootWindowController* root_window_controller)
     : root_window_controller_(root_window_controller),
-      audio_handler_(chromeos::CrasAudioHandler::Get()) {
+      audio_handler_(chromeos::CrasAudioHandler::Get()),
+      enable_chromevox_arc_support_(
+          base::CommandLine::ForCurrentProcess()->HasSwitch(
+              chromeos::switches::kEnableChromeVoxArcSupport)) {
   WmShell::Get()->system_tray_notifier()->AddAccessibilityObserver(this);
   Shell::GetInstance()->activation_client()->AddObserver(this);
   display::Screen::GetScreen()->AddObserver(this);
   UpdateTouchExplorationState();
 }
 
 AshTouchExplorationManager::~AshTouchExplorationManager() {
   SystemTrayNotifier* system_tray_notifier =
       WmShell::Get()->system_tray_notifier();
   if (system_tray_notifier)
@@ skipping 87 matching lines @@
 
 void AshTouchExplorationManager::SetTouchAccessibilityAnchorPoint(
     const gfx::Point& anchor_point) {
   if (touch_exploration_controller_) {
     touch_exploration_controller_->SetTouchAccessibilityAnchorPoint(
         anchor_point);
   }
 }
 
 void AshTouchExplorationManager::UpdateTouchExplorationState() {
-  // Comes from components/exo/shell_surface.cc.
-  const char kExoShellSurfaceWindowName[] = "ExoShellSurface";
-
   // See crbug.com/603745 for more details.
   const bool pass_through_surface =
       wm::GetActiveWindow() &&
-      wm::GetActiveWindow()->GetName() == kExoShellSurfaceWindowName;
+      wm::GetActiveWindow()->GetProperty(aura::client::kAppType) ==
+          static_cast<int>(ash::AppType::ARC_APP) &&
+      !enable_chromevox_arc_support_;
 
   const bool spoken_feedback_enabled =
       Shell::GetInstance()->accessibility_delegate()->IsSpokenFeedbackEnabled();
 
   if (!touch_accessibility_enabler_) {
     // Always enable gesture to toggle spoken feedback.
     touch_accessibility_enabler_.reset(new ui::TouchAccessibilityEnabler(
         root_window_controller_->GetRootWindow(), this));
   }
 
@@ skipping 18 matching lines @@
     touch_exploration_controller_.reset();
   }
 }
 
 bool AshTouchExplorationManager::VolumeAdjustSoundEnabled() {
   return !base::CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kDisableVolumeAdjustSound);
 }
 
 }  // namespace ash