Commit 225851a1 authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Switch an instance of LazyInstance to NoDestructor.

Bug: 925323
Change-Id: I02b3d2cf43b30f4fb3a8cb6f5f23fd7387439826
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1894706
Auto-Submit: Avi Drissman <avi@chromium.org>
Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712615}
parent 4e6e72bd
......@@ -12,7 +12,6 @@
#include "base/base64.h"
#include "base/bind.h"
#include "base/lazy_instance.h"
#include "base/mac/scoped_nsobject.h"
#include "base/no_destructor.h"
#include "base/strings/sys_string_conversions.h"
......@@ -43,9 +42,6 @@ namespace views {
namespace {
base::LazyInstance<ui::GestureRecognizerImplMac>::Leaky
g_gesture_recognizer_instance = LAZY_INSTANCE_INITIALIZER;
static base::RepeatingCallback<void(NativeWidgetMac*)>*
g_init_native_widget_callback = nullptr;
......@@ -732,7 +728,8 @@ bool NativeWidgetMac::IsTranslucentWindowOpacitySupported() const {
}
ui::GestureRecognizer* NativeWidgetMac::GetGestureRecognizer() {
return g_gesture_recognizer_instance.Pointer();
static base::NoDestructor<ui::GestureRecognizerImplMac> recognizer;
return recognizer.get();
}
void NativeWidgetMac::OnSizeConstraintsChanged() {
......@@ -963,7 +960,7 @@ void NativeWidgetPrivate::ReparentNativeView(gfx::NativeView native_view,
for (auto* child : widgets)
child->NotifyNativeViewHierarchyWillChange();
// Update |brige_host|'s parent only if
// Update |bridge_host|'s parent only if
// NativeWidgetNSWindowBridge::ReparentNativeView will.
if (native_view == bridge_view) {
window_host->SetParent(parent_window_host);
......
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