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

Unified Diff: ui/base/cursor/ozone/cursor_factory_ozone.cc

Issue 291473002: ozone: Initialize a subsystem only if necessary. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-r270817 Created 6 years, 7 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
« no previous file with comments | « ui/base/cursor/ozone/cursor_factory_ozone.h ('k') | ui/events/ozone/device/udev/device_manager_udev.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cursor/ozone/cursor_factory_ozone.cc
diff --git a/ui/base/cursor/ozone/cursor_factory_ozone.cc b/ui/base/cursor/ozone/cursor_factory_ozone.cc
index 709412e0c8b39d9b19e5611ac7f4789c1f7d5798..51fd7f82b9801278f1c9d310675c05eb5bdda01a 100644
--- a/ui/base/cursor/ozone/cursor_factory_ozone.cc
+++ b/ui/base/cursor/ozone/cursor_factory_ozone.cc
@@ -11,17 +11,21 @@ namespace ui {
// static
CursorFactoryOzone* CursorFactoryOzone::impl_ = NULL;
-CursorFactoryOzone::CursorFactoryOzone() {}
+CursorFactoryOzone::CursorFactoryOzone() {
+ CHECK(!impl_) << "There should only be a single CursorFactoryOzone.";
+ impl_ = this;
+}
-CursorFactoryOzone::~CursorFactoryOzone() {}
+CursorFactoryOzone::~CursorFactoryOzone() {
+ CHECK_EQ(impl_, this);
+ impl_ = NULL;
+}
CursorFactoryOzone* CursorFactoryOzone::GetInstance() {
CHECK(impl_) << "No CursorFactoryOzone implementation set.";
return impl_;
}
-void CursorFactoryOzone::SetInstance(CursorFactoryOzone* impl) { impl_ = impl; }
-
PlatformCursor CursorFactoryOzone::GetDefaultCursor(int type) {
NOTIMPLEMENTED();
return NULL;
« no previous file with comments | « ui/base/cursor/ozone/cursor_factory_ozone.h ('k') | ui/events/ozone/device/udev/device_manager_udev.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698