OLD | NEW |
---|---|
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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_menu_list.h" | 5 #include "ui/base/x/x11_menu_list.h" |
6 | 6 |
7 #include <algorithm> | |
danakj
2015/11/16 22:19:03
need whitespace between <> and "" includes?
dcheng
2015/11/17 17:08:42
Done.
| |
7 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
8 #include "ui/base/x/x11_util.h" | 9 #include "ui/base/x/x11_util.h" |
9 | 10 |
10 namespace ui { | 11 namespace ui { |
11 | 12 |
12 // static | 13 // static |
13 XMenuList* XMenuList::GetInstance() { | 14 XMenuList* XMenuList::GetInstance() { |
14 return base::Singleton<XMenuList>::get(); | 15 return base::Singleton<XMenuList>::get(); |
15 } | 16 } |
16 | 17 |
(...skipping 20 matching lines...) Expand all Loading... | |
37 if (iter == menus_.end()) | 38 if (iter == menus_.end()) |
38 return; | 39 return; |
39 menus_.erase(iter); | 40 menus_.erase(iter); |
40 } | 41 } |
41 | 42 |
42 void XMenuList::InsertMenuWindowXIDs(std::vector<XID>* stack) { | 43 void XMenuList::InsertMenuWindowXIDs(std::vector<XID>* stack) { |
43 stack->insert(stack->begin(), menus_.begin(), menus_.end()); | 44 stack->insert(stack->begin(), menus_.begin(), menus_.end()); |
44 } | 45 } |
45 | 46 |
46 } // namespace ui | 47 } // namespace ui |
OLD | NEW |