Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: use raw_ref in RootView #42114

Merged
merged 3 commits into from
May 15, 2024
Merged

refactor: use raw_ref in RootView #42114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8eb9ee
refactor: make RootView::window_ a const raw_ref
ckerr May 10, 2024
b4cb38d
refactor: make RootView::main_view_ a const raw_ref
ckerr May 10, 2024
4810e62
refactor: aggregate RootView::last_focused_view_tracker_
ckerr May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions shell/browser/ui/views/root_view.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ bool IsAltModifier(const content::NativeWebKeyboardEvent& event) {
} // namespace

RootView::RootView(NativeWindow* window)
: window_(window),
last_focused_view_tracker_(std::make_unique<views::ViewTracker>()) {
: window_{raw_ref<NativeWindow>::from_ptr(window)},
main_view_{raw_ref<views::View>::from_ptr(
AddChildView(std::make_unique<views::View>()))} {
set_owned_by_client();
views::BoxLayout* layout =
SetLayoutManager(std::make_unique<views::BoxLayout>(
views::BoxLayout::Orientation::kVertical));
main_view_ = AddChildView(std::make_unique<views::View>());
main_view_->SetUseDefaultFillLayout(true);
layout->SetFlexForView(main_view_, 1);
layout->SetFlexForView(&main_view_.get(), 1);
}

RootView::~RootView() = default;
Expand All @@ -62,7 +62,7 @@ void RootView::SetMenu(ElectronMenuModel* menu_model) {
return;

if (!menu_bar_) {
menu_bar_ = std::make_unique<MenuBar>(window_, this);
menu_bar_ = std::make_unique<MenuBar>(&window_.get(), this);
menu_bar_->set_owned_by_client();
if (!menu_bar_autohide_)
SetMenuBarVisibility(true);
Expand Down Expand Up @@ -116,7 +116,7 @@ void RootView::HandleKeyEvent(const content::NativeWebKeyboardEvent& event) {
SetMenuBarVisibility(true);

View* focused_view = GetFocusManager()->GetFocusedView();
last_focused_view_tracker_->SetView(focused_view);
last_focused_view_tracker_.SetView(focused_view);
menu_bar_->RequestFocus();
}

Expand All @@ -137,7 +137,7 @@ void RootView::HandleKeyEvent(const content::NativeWebKeyboardEvent& event) {
SetMenuBarVisibility(!menu_bar_visible_);

View* focused_view = GetFocusManager()->GetFocusedView();
last_focused_view_tracker_->SetView(focused_view);
last_focused_view_tracker_.SetView(focused_view);
if (menu_bar_visible_) {
menu_bar_->RequestFocus();
// Show accelerators when menu bar is focused
Expand All @@ -150,7 +150,7 @@ void RootView::HandleKeyEvent(const content::NativeWebKeyboardEvent& event) {
}

void RootView::RestoreFocus() {
View* last_focused_view = last_focused_view_tracker_->view();
View* last_focused_view = last_focused_view_tracker_.view();
if (last_focused_view) {
GetFocusManager()->SetFocusedViewWithReason(
last_focused_view,
Expand Down
9 changes: 5 additions & 4 deletions shell/browser/ui/views/root_view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <memory>

#include "base/memory/raw_ptr.h"
#include "base/memory/raw_ref.h"
#include "shell/browser/ui/accelerator_util.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/views/view.h"
Expand Down Expand Up @@ -46,7 +47,7 @@ class RootView : public views::View {
void RegisterAcceleratorsWithFocusManager(ElectronMenuModel* menu_model);
void UnregisterAcceleratorsWithFocusManager();

views::View* GetMainView() { return main_view_; }
views::View* GetMainView() { return &main_view_.get(); }

// views::View:
gfx::Size GetMinimumSize() const override;
Expand All @@ -55,7 +56,7 @@ class RootView : public views::View {

private:
// Parent window, weak ref.
raw_ptr<NativeWindow> window_;
const raw_ref<NativeWindow> window_;

// Menu bar.
std::unique_ptr<MenuBar> menu_bar_;
Expand All @@ -64,12 +65,12 @@ class RootView : public views::View {
bool menu_bar_alt_pressed_ = false;

// Main view area.
raw_ptr<views::View> main_view_;
const raw_ref<views::View> main_view_;

// Map from accelerator to menu item's command id.
accelerator_util::AcceleratorTable accelerator_table_;

std::unique_ptr<views::ViewTracker> last_focused_view_tracker_;
views::ViewTracker last_focused_view_tracker_;
};

} // namespace electron
Expand Down