This is required to make ArcVoiceInteractionFrameworkService and PaletteDelegateChromeOS mash-compatible. This can be achieved by having MetalayerMode directly use Shell::Get()->highlighter_controller().
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/9c6b85a70f051e22435a97196f02955088279ed5 commit 9c6b85a70f051e22435a97196f02955088279ed5 Author: Vladislav Kaznacheev <kaznacheev@google.com> Date: Mon Oct 02 20:41:18 2017 Remove metalayer-related methods from PaletteDelegate Make MetalayerMode access Shell::Get()->highlighter_controller() directly (not via PaletteDelegate as it used to do). Move the code responsible for auto-exiting the metalayer mode from PaletteDelegateChromeOS to HighlighterController. This is the first step towards shrinking and possibly removing PaletteDelegate in favor of feature-specific mojo connections. Bug: 769996 Test: ash_unittests --gtest_filter=Palette* Change-Id: Ic2f9f79e5f45b30127c20152b36552c2c6118217 Reviewed-on: https://chromium-review.googlesource.com/692748 Commit-Queue: Vladislav Kaznacheev <kaznacheev@chromium.org> Reviewed-by: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#505771} [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/ash/highlighter/highlighter_controller.cc [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/ash/highlighter/highlighter_controller.h [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/ash/highlighter/highlighter_controller_test_api.cc [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/ash/highlighter/highlighter_controller_test_api.h [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/ash/highlighter/highlighter_controller_unittest.cc [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/ash/highlighter/highlighter_selection_observer.h [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/ash/palette_delegate.h [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/ash/shell/shell_delegate_impl.cc [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/ash/system/palette/palette_tray_unittest.cc [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/ash/system/palette/test_palette_delegate.cc [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/ash/system/palette/test_palette_delegate.h [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/ash/system/palette/tools/metalayer_mode.cc [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/ash/system/palette/tools/metalayer_unittest.cc [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/chrome/browser/chromeos/BUILD.gn [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.cc [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.h [add] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/chrome/browser/chromeos/arc/voice_interaction/highlighter_controller_client.cc [add] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/chrome/browser/chromeos/arc/voice_interaction/highlighter_controller_client.h [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/chrome/browser/ui/ash/palette_delegate_chromeos.cc [modify] https://crrev.com/9c6b85a70f051e22435a97196f02955088279ed5/chrome/browser/ui/ash/palette_delegate_chromeos.h
Comment 1 by kaznacheev@chromium.org
, Sep 28 2017