diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/views/controls/tabbed_pane | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-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/tabbed_pane')
3 files changed, 6 insertions, 13 deletions
diff --git a/chromium/ui/views/controls/tabbed_pane/tabbed_pane.cc b/chromium/ui/views/controls/tabbed_pane/tabbed_pane.cc index 4fdef37e512..50ecb7c042b 100644 --- a/chromium/ui/views/controls/tabbed_pane/tabbed_pane.cc +++ b/chromium/ui/views/controls/tabbed_pane/tabbed_pane.cc @@ -510,6 +510,11 @@ TabbedPane::TabbedPane(TabbedPane::Orientation orientation, views::FlexSpecification(views::MinimumFlexSizeRule::kScaleToZero, views::MaximumFlexSizeRule::kUnbounded)); contents_->SetLayoutManager(std::make_unique<views::FillLayout>()); + + // Support navigating tabs by Ctrl+Tab and Ctrl+Shift+Tab. + AddAccelerator( + ui::Accelerator(ui::VKEY_TAB, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN)); + AddAccelerator(ui::Accelerator(ui::VKEY_TAB, ui::EF_CONTROL_DOWN)); } TabbedPane::~TabbedPane() = default; @@ -600,16 +605,6 @@ bool TabbedPane::MoveSelectionBy(int delta) { return true; } -void TabbedPane::ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) { - if (details.is_add) { - // Support navigating tabs by Ctrl+Tab and Ctrl+Shift+Tab. - AddAccelerator( - ui::Accelerator(ui::VKEY_TAB, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN)); - AddAccelerator(ui::Accelerator(ui::VKEY_TAB, ui::EF_CONTROL_DOWN)); - } -} - bool TabbedPane::AcceleratorPressed(const ui::Accelerator& accelerator) { // Handle Ctrl+Tab and Ctrl+Shift+Tab navigation of pages. DCHECK(accelerator.key_code() == ui::VKEY_TAB && accelerator.IsCtrlDown()); diff --git a/chromium/ui/views/controls/tabbed_pane/tabbed_pane.h b/chromium/ui/views/controls/tabbed_pane/tabbed_pane.h index 4c42c238ecb..97553af580f 100644 --- a/chromium/ui/views/controls/tabbed_pane/tabbed_pane.h +++ b/chromium/ui/views/controls/tabbed_pane/tabbed_pane.h @@ -123,8 +123,6 @@ class VIEWS_EXPORT TabbedPane : public View { bool MoveSelectionBy(int delta); // Overridden from View: - void ViewHierarchyChanged( - const ViewHierarchyChangedDetails& details) override; bool AcceleratorPressed(const ui::Accelerator& accelerator) override; void GetAccessibleNodeData(ui::AXNodeData* node_data) override; diff --git a/chromium/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/chromium/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc index 808afa4d777..6bb23566546 100644 --- a/chromium/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc +++ b/chromium/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc @@ -121,7 +121,7 @@ class TabbedPaneWithWidgetTest : public ViewsTestBase { params.bounds = gfx::Rect(0, 0, 650, 650); widget_->Init(std::move(params)); tabbed_pane_ = tabbed_pane.get(); - widget_->SetContentsView(tabbed_pane.release()); + widget_->SetContentsView(std::move(tabbed_pane)); } void TearDown() override { |