Commit 71a0edd4 authored by Xiaodan Zhu's avatar Xiaodan Zhu Committed by Commit Bot

Make Chomevox say full desk name instead of elided one

Bug: 1116178
Change-Id: I86a0ee351e2202267b6c66e5c0689c223b1eba87
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368042Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Reviewed-by: default avatarMin Chen <minch@chromium.org>
Commit-Queue: Xiaodan Zhu <zxdan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800753}
parent 0b311afc
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#include "ash/style/ash_color_provider.h" #include "ash/style/ash_color_provider.h"
#include "ash/wm/overview/overview_controller.h" #include "ash/wm/overview/overview_controller.h"
#include "ash/wm/overview/overview_grid.h" #include "ash/wm/overview/overview_grid.h"
#include "ui/accessibility/ax_enums.mojom.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/gfx/canvas.h" #include "ui/gfx/canvas.h"
#include "ui/gfx/text_constants.h" #include "ui/gfx/text_constants.h"
#include "ui/gfx/text_elider.h" #include "ui/gfx/text_elider.h"
...@@ -71,6 +73,7 @@ void DeskNameView::CommitChanges(views::Widget* widget) { ...@@ -71,6 +73,7 @@ void DeskNameView::CommitChanges(views::Widget* widget) {
void DeskNameView::SetTextAndElideIfNeeded(const base::string16& text) { void DeskNameView::SetTextAndElideIfNeeded(const base::string16& text) {
SetText(gfx::ElideText(text, GetFontList(), GetContentsBounds().width(), SetText(gfx::ElideText(text, GetFontList(), GetContentsBounds().width(),
gfx::ELIDE_TAIL)); gfx::ELIDE_TAIL));
full_text_ = text;
} }
const char* DeskNameView::GetClassName() const { const char* DeskNameView::GetClassName() const {
...@@ -100,6 +103,11 @@ bool DeskNameView::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { ...@@ -100,6 +103,11 @@ bool DeskNameView::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
return false; return false;
} }
void DeskNameView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
node_data->role = ax::mojom::Role::kTextField;
node_data->SetName(full_text_);
}
views::View* DeskNameView::GetView() { views::View* DeskNameView::GetView() {
return this; return this;
} }
......
...@@ -38,6 +38,7 @@ class ASH_EXPORT DeskNameView ...@@ -38,6 +38,7 @@ class ASH_EXPORT DeskNameView
const char* GetClassName() const override; const char* GetClassName() const override;
gfx::Size CalculatePreferredSize() const override; gfx::Size CalculatePreferredSize() const override;
bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) override; bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) override;
void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
// OverviewHighlightController::OverviewHighlightableView: // OverviewHighlightController::OverviewHighlightableView:
views::View* GetView() override; views::View* GetView() override;
...@@ -52,6 +53,9 @@ class ASH_EXPORT DeskNameView ...@@ -52,6 +53,9 @@ class ASH_EXPORT DeskNameView
// Owned by this View via `View::border_`. This is just a convenient pointer // Owned by this View via `View::border_`. This is just a convenient pointer
// to it. // to it.
WmHighlightItemBorder* border_ptr_; WmHighlightItemBorder* border_ptr_;
// Full text without being elided.
base::string16 full_text_;
}; };
} // namespace ash } // namespace ash
......
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