summaryrefslogtreecommitdiff
path: root/chromium/ui/views/controls/table
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/views/controls/table
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/views/controls/table')
-rw-r--r--chromium/ui/views/controls/table/table_view.cc2
-rw-r--r--chromium/ui/views/controls/table/table_view.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/chromium/ui/views/controls/table/table_view.cc b/chromium/ui/views/controls/table/table_view.cc
index 94eb7a0527c..fa791c4700c 100644
--- a/chromium/ui/views/controls/table/table_view.cc
+++ b/chromium/ui/views/controls/table/table_view.cc
@@ -183,6 +183,8 @@ TableView::TableView(ui::TableModel* model,
SetModel(model);
if (model_)
UpdateVirtualAccessibilityChildren();
+
+ focus_ring_ = FocusRing::Install(this);
}
TableView::~TableView() {
diff --git a/chromium/ui/views/controls/table/table_view.h b/chromium/ui/views/controls/table/table_view.h
index 1a640fdf53e..30f1b107602 100644
--- a/chromium/ui/views/controls/table/table_view.h
+++ b/chromium/ui/views/controls/table/table_view.h
@@ -13,7 +13,6 @@
#include "ui/base/models/table_model.h"
#include "ui/base/models/table_model_observer.h"
#include "ui/gfx/font_list.h"
-#include "ui/views/controls/focus_ring.h"
#include "ui/views/view.h"
#include "ui/views/views_export.h"
@@ -396,7 +395,7 @@ class VIEWS_EXPORT TableView : public views::View,
int active_visible_column_index_ = -1;
// Used to draw a focus indicator around the active cell.
- std::unique_ptr<FocusRing> focus_ring_ = FocusRing::Install(this);
+ FocusRing* focus_ring_ = nullptr;
// The header. This is only created if more than one column is specified or
// the first column has a non-empty title.