| 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> |
| 8 |
| 7 #include "base/memory/singleton.h" | 9 #include "base/memory/singleton.h" |
| 8 #include "ui/base/x/x11_util.h" | 10 #include "ui/base/x/x11_util.h" |
| 9 | 11 |
| 10 namespace ui { | 12 namespace ui { |
| 11 | 13 |
| 12 // static | 14 // static |
| 13 XMenuList* XMenuList::GetInstance() { | 15 XMenuList* XMenuList::GetInstance() { |
| 14 return base::Singleton<XMenuList>::get(); | 16 return base::Singleton<XMenuList>::get(); |
| 15 } | 17 } |
| 16 | 18 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 37 if (iter == menus_.end()) | 39 if (iter == menus_.end()) |
| 38 return; | 40 return; |
| 39 menus_.erase(iter); | 41 menus_.erase(iter); |
| 40 } | 42 } |
| 41 | 43 |
| 42 void XMenuList::InsertMenuWindowXIDs(std::vector<XID>* stack) { | 44 void XMenuList::InsertMenuWindowXIDs(std::vector<XID>* stack) { |
| 43 stack->insert(stack->begin(), menus_.begin(), menus_.end()); | 45 stack->insert(stack->begin(), menus_.begin(), menus_.end()); |
| 44 } | 46 } |
| 45 | 47 |
| 46 } // namespace ui | 48 } // namespace ui |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1445003002:
Use std::default_delete as the default deleter for scoped_ptr. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master