| Index: ui/base/idle/screensaver_window_finder_x11.cc
|
| diff --git a/ui/base/idle/screensaver_window_finder_x11.cc b/ui/base/idle/screensaver_window_finder_x11.cc
|
| index 74228ba41a4442c31e593cbcf9819a4c1f8d2431..e01cd247d39250d85919874c1baf095e080af166 100644
|
| --- a/ui/base/idle/screensaver_window_finder_x11.cc
|
| +++ b/ui/base/idle/screensaver_window_finder_x11.cc
|
| @@ -7,6 +7,7 @@
|
| #include <X11/extensions/scrnsaver.h>
|
|
|
| #include "ui/base/x/x11_util.h"
|
| +#include "ui/gfx/x/x11_atom_cache.h"
|
| #include "ui/gfx/x/x11_error_tracker.h"
|
|
|
| namespace ui {
|
| @@ -32,7 +33,7 @@ bool ScreensaverWindowFinder::ScreensaverWindowExists() {
|
| // info.state == ScreenSaverOff or info.state == ScreenSaverDisabled does not
|
| // necessarily mean that a screensaver is not active, so add a special check
|
| // for xscreensaver.
|
| - static XAtom lock_atom = GetAtom("LOCK");
|
| + XAtom lock_atom = gfx::GetAtom("LOCK");
|
| std::vector<int> atom_properties;
|
| if (GetIntArrayProperty(root, "_SCREENSAVER_STATUS", &atom_properties) &&
|
| atom_properties.size() > 0) {
|
|
|