| OLD | NEW | 
|   1 // Copyright 2014 The Chromium Authors. All rights reserved. |   1 // Copyright 2014 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/x11_foreign_window_manager.h" |   5 #include "ui/base/x/x11_foreign_window_manager.h" | 
|   6  |   6  | 
|   7 #include <X11/Xlib.h> |   7 #include <X11/Xlib.h> | 
|   8  |   8  | 
|   9 #include "base/compiler_specific.h" |   9 #include "base/compiler_specific.h" | 
|  10 #include "base/memory/singleton.h" |  10 #include "base/memory/singleton.h" | 
|  11  |  11  | 
|  12 namespace ui { |  12 namespace ui { | 
|  13  |  13  | 
|  14 // static |  14 // static | 
|  15 XForeignWindowManager* XForeignWindowManager::GetInstance() { |  15 XForeignWindowManager* XForeignWindowManager::GetInstance() { | 
|  16   return Singleton<XForeignWindowManager>::get(); |  16   return base::Singleton<XForeignWindowManager>::get(); | 
|  17 } |  17 } | 
|  18  |  18  | 
|  19 int XForeignWindowManager::RequestEvents(XID xid, long event_mask) { |  19 int XForeignWindowManager::RequestEvents(XID xid, long event_mask) { | 
|  20   request_map_[xid].push_back(Request(next_request_id_, event_mask)); |  20   request_map_[xid].push_back(Request(next_request_id_, event_mask)); | 
|  21   UpdateSelectedEvents(xid); |  21   UpdateSelectedEvents(xid); | 
|  22   return next_request_id_++; |  22   return next_request_id_++; | 
|  23 } |  23 } | 
|  24  |  24  | 
|  25 void XForeignWindowManager::CancelRequest(int request_id) { |  25 void XForeignWindowManager::CancelRequest(int request_id) { | 
|  26   for (std::map<XID, RequestVector>::iterator map_it = request_map_.begin(); |  26   for (std::map<XID, RequestVector>::iterator map_it = request_map_.begin(); | 
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  64  |  64  | 
|  65 XForeignWindowManager::Request::Request(int request_id, long event_mask) |  65 XForeignWindowManager::Request::Request(int request_id, long event_mask) | 
|  66     : request_id(request_id), |  66     : request_id(request_id), | 
|  67       event_mask(event_mask) { |  67       event_mask(event_mask) { | 
|  68 } |  68 } | 
|  69  |  69  | 
|  70 XForeignWindowManager::Request::~Request() { |  70 XForeignWindowManager::Request::~Request() { | 
|  71 } |  71 } | 
|  72  |  72  | 
|  73 }  // namespace ui |  73 }  // namespace ui | 
| OLD | NEW |