| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/base/x/root_window_property_watcher_x.h" | 5 #include "ui/base/x/root_window_property_watcher_x.h" |
| 6 | 6 |
| 7 #include <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
| 8 #include <gdk/gdkx.h> | 8 #include <gdk/gdkx.h> |
| 9 | 9 |
| 10 #include "base/memory/singleton.h" |
| 10 #include "ui/base/x/active_window_watcher_x.h" | 11 #include "ui/base/x/active_window_watcher_x.h" |
| 11 #include "ui/base/x/work_area_watcher_x.h" | 12 #include "ui/base/x/work_area_watcher_x.h" |
| 12 | 13 |
| 13 namespace ui { | 14 namespace ui { |
| 14 | 15 |
| 15 namespace internal { | 16 namespace internal { |
| 16 | 17 |
| 17 // static | 18 // static |
| 18 RootWindowPropertyWatcherX* RootWindowPropertyWatcherX::GetInstance() { | 19 RootWindowPropertyWatcherX* RootWindowPropertyWatcherX::GetInstance() { |
| 19 return Singleton<RootWindowPropertyWatcherX>::get(); | 20 return Singleton<RootWindowPropertyWatcherX>::get(); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 49 else if (xev->xproperty.atom == WorkAreaWatcherX::GetPropertyAtom()) | 50 else if (xev->xproperty.atom == WorkAreaWatcherX::GetPropertyAtom()) |
| 50 WorkAreaWatcherX::Notify(); | 51 WorkAreaWatcherX::Notify(); |
| 51 } | 52 } |
| 52 | 53 |
| 53 return GDK_FILTER_CONTINUE; | 54 return GDK_FILTER_CONTINUE; |
| 54 } | 55 } |
| 55 | 56 |
| 56 } // namespace internal | 57 } // namespace internal |
| 57 | 58 |
| 58 } // namespace ui | 59 } // namespace ui |
| OLD | NEW |