Replace clickable backplane with a close button in speech recogntion UI

Bug: NONE
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I583c207a627d26ad51d13c0f4e916dfb0e4ac134
Reviewed-on: https://chromium-review.googlesource.com/776238
Commit-Queue: Biao She <bshe@chromium.org>
Reviewed-by: Ian Vollick <vollick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517598}

chrome/browser/vr/elements/ui_element_name.cc

@@ -83,7 +83,7 @@ static const char* g_ui_element_name_strings[] = {
     "kSpeechRecognitionListeningGrowingCircle",
     "kSpeechRecognitionListeningInnerCircle",
     "kSpeechRecognitionListeningMicrophoneIcon",
-    "kSpeechRecognitionListeningBackplane",
+    "kSpeechRecognitionListeningCloseButton",
     "kSuggestionLayout",
     "kNumUiElementNames",
 };

chrome/browser/vr/elements/ui_element_name.h

@@ -83,7 +83,7 @@ enum UiElementName {
   kSpeechRecognitionListeningGrowingCircle,
   kSpeechRecognitionListeningInnerCircle,
   kSpeechRecognitionListeningMicrophoneIcon,
-  kSpeechRecognitionListeningBackplane,
+  kSpeechRecognitionListeningCloseButton,
   kSuggestionLayout,
 
   // This must be last.

chrome/browser/vr/ui_renderer_unittest.cc

@@ -166,7 +166,7 @@ TestParams params[] = {
          kSpeechRecognitionListeningGrowingCircle,
          kSpeechRecognitionListeningInnerCircle,
          kSpeechRecognitionListeningMicrophoneIcon,
-         kSpeechRecognitionListeningBackplane,
+         kSpeechRecognitionListeningCloseButton,
      }},
     {&UiScene::GetVisible2dBrowsingOverlayElements,
      {

chrome/browser/vr/ui_scene_constants.h

@@ -119,10 +119,18 @@ static constexpr int kFloorGridlineCount = 40;
 // Tiny distance to offset textures that should appear in the same plane.
 static constexpr float kTextureOffset = 0.01f;
 
-static constexpr float kVoiceSearchButtonWidth = 0.096f * kUrlBarDistance;
+static constexpr float kVoiceSearchUIGroupButtonDMM = 0.096f;
+static constexpr float kVoiceSearchButtonWidth =
+    kVoiceSearchUIGroupButtonDMM * kUrlBarDistance;
 static constexpr float kVoiceSearchButtonHeight = kVoiceSearchButtonWidth;
 static constexpr float kVoiceSearchButtonYOffset =
-    (0.5 * kUrlBarHeightDMM + 0.032) * kUrlBarDistance;
+    (0.5f * kUrlBarHeightDMM + 0.032f) * kUrlBarDistance;
+static constexpr float kVoiceSearchCloseButtonWidth =
+    kVoiceSearchUIGroupButtonDMM * kContentDistance;
+static constexpr float kVoiceSearchCloseButtonHeight =
+    kVoiceSearchCloseButtonWidth;
+static constexpr float kVoiceSearchCloseButtonYOffset =
+    0.316f * kContentDistance + 0.5f * kVoiceSearchCloseButtonWidth;
 
 static constexpr float kUnderDevelopmentNoticeFontHeightM =
     0.02f * kUrlBarDistance;

chrome/browser/vr/ui_scene_manager.cc

@@ -738,18 +738,15 @@ void UiSceneManager::CreateVoiceSearchUiGroup(Model* model) {
   microphone_icon->SetSize(kCloseButtonWidth, kCloseButtonHeight);
   scene_->AddUiElement(kSpeechRecognitionListening, std::move(microphone_icon));
 
-  auto backplane = base::MakeUnique<InvisibleHitTarget>();
-  speech_recognition_prompt_backplane_ = backplane.get();
-  backplane->set_name(kSpeechRecognitionListeningBackplane);
-  backplane->set_draw_phase(kPhaseForeground);
-  backplane->SetSize(kPromptBackplaneSize, kPromptBackplaneSize);
-  backplane->SetTranslate(0.0, 0.0, kTextureOffset);
-  EventHandlers event_handlers;
-  event_handlers.button_up = base::Bind(
-      &UiSceneManager::OnExitRecognizingSpeechClicked, base::Unretained(this));
-  backplane->set_event_handlers(event_handlers);
-
-  scene_->AddUiElement(kSpeechRecognitionListening, std::move(backplane));
+  auto close_button = base::MakeUnique<Button>(
+      base::Bind(&UiSceneManager::OnExitRecognizingSpeechClicked,
+                 base::Unretained(this)),
+      kPhaseForeground, kVoiceSearchCloseButtonWidth,
+      kVoiceSearchCloseButtonHeight, vector_icons::kClose16Icon);
+  close_button->set_name(kSpeechRecognitionListeningCloseButton);
+  close_button->SetTranslate(0.0, -kVoiceSearchCloseButtonYOffset, 0.f);
+  BindColor(this, close_button.get(), &ColorScheme::button_colors);
+  scene_->AddUiElement(kSpeechRecognitionListening, std::move(close_button));
 
   UiElement* browser_foregroud =
       scene_->GetUiElementByName(k2dBrowsingForeground);

chrome/browser/vr/ui_scene_manager.h

@@ -207,7 +207,6 @@ class UiSceneManager {
   TransientElement* exclusive_screen_toast_viewport_aware_transient_parent_ =
       nullptr;
   ShowUntilSignalTransientElement* splash_screen_transient_parent_ = nullptr;
-  UiElement* speech_recognition_prompt_backplane_ = nullptr;
   UiElement* exit_warning_ = nullptr;
   ContentElement* main_content_ = nullptr;
   UiElement* audio_capture_indicator_ = nullptr;

chrome/browser/vr/ui_scene_manager_unittest.cc

@@ -64,10 +64,10 @@ const std::set<UiElementName> kHitTestableElements = {
     kWebVrTimeoutMessageText,
     kWebVrTimeoutMessageButtonText,
     kSpeechRecognitionResultBackplane,
-    kSpeechRecognitionListeningBackplane,
 };
 const std::set<UiElementName> kSpecialHitTestableElements = {
     kCloseButton, kWebVrTimeoutMessageButton, kVoiceSearchButton,
+    kSpeechRecognitionListeningCloseButton,
 };
 const std::set<UiElementName> kElementsVisibleWithExitWarning = {
     kScreenDimmer, kExitWarning,
@@ -723,7 +723,7 @@ TEST_F(UiSceneManagerTest, SpeechRecognitionUiVisibility) {
                     false);
   VerifyVisibility(
       {kSpeechRecognitionListening, kSpeechRecognitionListeningMicrophoneIcon,
-       kSpeechRecognitionListeningBackplane,
+       kSpeechRecognitionListeningCloseButton,
        kSpeechRecognitionListeningInnerCircle,
        kSpeechRecognitionListeningGrowingCircle},
       true);