Enable native accessible touch support inside of ARC

ash/ash_touch_exploration_manager_chromeos.cc

Index: ash/ash_touch_exploration_manager_chromeos.cc
diff --git a/ash/ash_touch_exploration_manager_chromeos.cc b/ash/ash_touch_exploration_manager_chromeos.cc
index e77cd13a6fbb0523f0d92f3b8d368c38e77486f6..873f63610a9140426f0e90320a9846c884468634 100644
--- a/ash/ash_touch_exploration_manager_chromeos.cc
+++ b/ash/ash_touch_exploration_manager_chromeos.cc
@@ -9,6 +9,7 @@
 #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"
@@ -16,6 +17,7 @@
 #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"
 
@@ -24,7 +26,10 @@ 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);
@@ -132,13 +137,12 @@ void AshTouchExplorationManager::SetTouchAccessibilityAnchorPoint(
 }
 
 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();