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

Unified Diff: ui/base/idle/idle_query_x11.cc

Issue 989993002: x11: Use scoped_ptr<> for X11 objects where it makes sense. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 9 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 | « content/content_common.gypi ('k') | ui/base/ime/chromeos/ime_keyboard_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/idle/idle_query_x11.cc
diff --git a/ui/base/idle/idle_query_x11.cc b/ui/base/idle/idle_query_x11.cc
index 30bdeb6542a315c1f95cc1377a4ac1d998ac606f..1b1d5b5997e7559007f794d7e89d9b693b61b032 100644
--- a/ui/base/idle/idle_query_x11.cc
+++ b/ui/base/idle/idle_query_x11.cc
@@ -17,18 +17,14 @@ class IdleData {
int error_base;
if (XScreenSaverQueryExtension(gfx::GetXDisplay(), &event_base,
&error_base)) {
- mit_info = XScreenSaverAllocInfo();
- } else {
- mit_info = NULL;
+ mit_info.reset(XScreenSaverAllocInfo());
}
}
~IdleData() {
- if (mit_info)
- XFree(mit_info);
}
- XScreenSaverInfo *mit_info;
+ gfx::XScopedPtr<XScreenSaverInfo> mit_info;
};
IdleQueryX11::IdleQueryX11() : idle_data_(new IdleData()) {}
@@ -41,7 +37,7 @@ int IdleQueryX11::IdleTime() {
if (XScreenSaverQueryInfo(gfx::GetXDisplay(),
RootWindow(gfx::GetXDisplay(), 0),
- idle_data_->mit_info)) {
+ idle_data_->mit_info.get())) {
return (idle_data_->mit_info->idle) / 1000;
} else {
return 0;
« no previous file with comments | « content/content_common.gypi ('k') | ui/base/ime/chromeos/ime_keyboard_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698