Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Unified Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Issue 134103006: linux_aura: Fix cursor memeory leak, which was redding the lsan bot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
index 74ef63428d87c2d263f978c1408c178fdfe524f3..8f74d3780bac9047408a4d9382d4b9f691a30d01 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
@@ -5,6 +5,7 @@
#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
+#include "base/lazy_instance.h"
#include "base/memory/weak_ptr.h"
#include "ui/aura/client/activation_change_observer.h"
#include "ui/aura/client/activation_delegate.h"
@@ -295,7 +296,8 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
bool restore_focus_on_activate_;
gfx::NativeCursor cursor_;
- static views::corewm::CursorManager* cursor_manager_;
+ static base::LazyInstance<scoped_ptr<views::corewm::CursorManager> >
+ cursor_manager_;
static views::DesktopNativeCursorManager* native_cursor_manager_;
scoped_ptr<corewm::ShadowController> shadow_controller_;

Powered by Google App Engine
This is Rietveld 408576698