Use ClientView instead of DialogClientView for Assistant.

Previously we used a DialogClientView which supported handling of the
ESCAPE key to close the widget. Now, we're switching to the lighter
weight ClientView which necessitates us adding ESCAPE support ourselves.

Bug: b:123607402
Change-Id: I64c1fe1cd38f6f9daafc993956c10f143fa5a4f4
Reviewed-on: https://chromium-review.googlesource.com/c/1446405
Commit-Queue: David Black <dmblack@google.com>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#628556}

ash/assistant/ui/assistant_container_view.cc

@@ -29,7 +29,6 @@
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/view.h"
-#include "ui/views/window/dialog_client_view.h"
 
 namespace ash {
 
@@ -49,22 +48,22 @@ DEFINE_UI_CLASS_PROPERTY_KEY(bool, kOnlyAllowMouseClickEvents, false);
 // paint to a higher level in the layer tree than do direct children of
 // AssistantContainerView. This allows AssistantMainView, for example, to
 // pseudo-parent overlays that draw over top of Assistant cards.
-class AssistantContainerClientView : public views::DialogClientView,
+class AssistantContainerClientView : public views::ClientView,
                                      public views::ViewObserver {
  public:
   AssistantContainerClientView(views::Widget* widget,
                                views::View* contents_view)
-      : views::DialogClientView(widget, contents_view) {}
+      : views::ClientView(widget, contents_view) {}
 
   ~AssistantContainerClientView() override = default;
 
-  // views::DialogClientView:
+  // views::ClientView:
   const char* GetClassName() const override {
     return "AssistantContainerClientView";
   }
 
   void Layout() override {
-    views::DialogClientView::Layout();
+    views::ClientView::Layout();
     for (AssistantOverlay* overlay : overlays_) {
       AssistantOverlay::LayoutParams layout_params = overlay->GetLayoutParams();
       gfx::Size preferred_size = overlay->GetPreferredSize();

ash/assistant/ui/caption_bar.cc

@@ -58,10 +58,13 @@ bool CaptionBar::AcceleratorPressed(const ui::Accelerator& accelerator) {
     case ui::VKEY_BROWSER_BACK:
       HandleButton(AssistantButtonId::kBack);
       break;
+    case ui::VKEY_ESCAPE:
+      HandleButton(AssistantButtonId::kClose);
+      break;
     case ui::VKEY_W:
-      if (accelerator.IsCtrlDown())
+      if (accelerator.IsCtrlDown()) {
         HandleButton(AssistantButtonId::kClose);
-      else {
+      } else {
         NOTREACHED();
         return false;
       }
@@ -71,7 +74,7 @@ bool CaptionBar::AcceleratorPressed(const ui::Accelerator& accelerator) {
       return false;
   }
 
-  // Don't let DialogClientView handle the accelerator.
+  // Don't let ClientView handle the accelerator.
   return true;
 }
 
@@ -127,9 +130,10 @@ void CaptionBar::InitLayout() {
                           AssistantButtonId::kClose, this);
   AddChildView(close_button);
 
-  // Add a keyboard accelerator Ctrl + W to close Assistant UI.
-  AddAccelerator(ui::Accelerator(ui::VKEY_W, ui::EF_CONTROL_DOWN));
-  AddAccelerator(ui::Accelerator(ui::VKEY_BROWSER_BACK, ui::EF_NONE));
+  // Add accelerators for keyboard shortcuts that behave like caption buttons.
+  AddAccelerator(ui::Accelerator(ui::VKEY_BROWSER_BACK, ui::EF_NONE));  // Back
+  AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));        // Close
+  AddAccelerator(ui::Accelerator(ui::VKEY_W, ui::EF_CONTROL_DOWN));     // Close
 }
 
 void CaptionBar::HandleButton(AssistantButtonId id) {