Commit ed78fae3 authored by Matthew Mourgos's avatar Matthew Mourgos Committed by Commit Bot

cros: Stop search box view from intercepting events in overview mode.

- The launcher search box will now only process events when the app list main
  view can process events.

Bug: 985583
Change-Id: I0716a84dece411ede7a905932d70e55ece78e8eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1722249
Commit-Queue: Alex Newcomer <newcomer@chromium.org>
Reviewed-by: default avatarAlex Newcomer <newcomer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681898}
parent e3fa1cdc
...@@ -223,6 +223,13 @@ const char* SearchBoxView::GetClassName() const { ...@@ -223,6 +223,13 @@ const char* SearchBoxView::GetClassName() const {
return "SearchBoxView"; return "SearchBoxView";
} }
bool SearchBoxView::CanProcessEventsWithinSubtree() const {
if (!view_delegate_->CanProcessEventsOnApplistViews())
return false;
return views::View::CanProcessEventsWithinSubtree();
}
// static // static
int SearchBoxView::GetFocusRingSpacing() { int SearchBoxView::GetFocusRingSpacing() {
return kSearchBoxFocusRingWidth + kSearchBoxFocusRingPadding; return kSearchBoxFocusRingWidth + kSearchBoxFocusRingPadding;
......
...@@ -65,6 +65,7 @@ class APP_LIST_EXPORT SearchBoxView : public search_box::SearchBoxViewBase, ...@@ -65,6 +65,7 @@ class APP_LIST_EXPORT SearchBoxView : public search_box::SearchBoxViewBase,
void GetAccessibleNodeData(ui::AXNodeData* node_data) override; void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
void OnPaintBackground(gfx::Canvas* canvas) override; void OnPaintBackground(gfx::Canvas* canvas) override;
const char* GetClassName() const override; const char* GetClassName() const override;
bool CanProcessEventsWithinSubtree() const override;
// Overridden from views::ButtonListener: // Overridden from views::ButtonListener:
void ButtonPressed(views::Button* sender, const ui::Event& event) override; void ButtonPressed(views::Button* sender, const ui::Event& event) override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment