| 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/chromeos/ime/input_method_menu_manager.h" | 5 #include "ui/chromeos/ime/input_method_menu_manager.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
| 9 | 9 |
| 10 namespace ui { | 10 namespace ui { |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 for (size_t i = 0; i < menu_list_.size(); ++i) { | 43 for (size_t i = 0; i < menu_list_.size(); ++i) { |
| 44 if (menu_list_[i].key == key) { | 44 if (menu_list_[i].key == key) { |
| 45 return true; | 45 return true; |
| 46 } | 46 } |
| 47 } | 47 } |
| 48 return false; | 48 return false; |
| 49 } | 49 } |
| 50 | 50 |
| 51 // static | 51 // static |
| 52 InputMethodMenuManager* InputMethodMenuManager::GetInstance() { | 52 InputMethodMenuManager* InputMethodMenuManager::GetInstance() { |
| 53 return Singleton<InputMethodMenuManager>::get(); | 53 return base::Singleton<InputMethodMenuManager>::get(); |
| 54 } | 54 } |
| 55 | 55 |
| 56 } // namespace ime | 56 } // namespace ime |
| 57 } // namespace ui | 57 } // namespace ui |
| OLD | NEW |