| 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 "base/observer_list.h" | 5 #include "base/observer_list.h" |
| 6 #include "ui/chromeos/ime/input_method_menu_item.h" | 6 #include "ui/chromeos/ime/view/input_method_menu_item.h" |
| 7 #include "ui/chromeos/ui_chromeos_export.h" | 7 #include "ui/chromeos/ui_chromeos_export.h" |
| 8 | 8 |
| 9 #ifndef UI_CHROMEOS_IME_INPUT_METHOD_MENU_MANAGER_H_ | 9 #ifndef UI_CHROMEOS_IME_INPUT_METHOD_MENU_MANAGER_H_ |
| 10 #define UI_CHROMEOS_IME_INPUT_METHOD_MENU_MANAGER_H_ | 10 #define UI_CHROMEOS_IME_INPUT_METHOD_MENU_MANAGER_H_ |
| 11 | 11 |
| 12 template<typename Type> struct DefaultSingletonTraits; | 12 template<typename Type> struct DefaultSingletonTraits; |
| 13 | 13 |
| 14 namespace ui { | 14 namespace ui { |
| 15 namespace ime { | 15 namespace ime { |
| 16 | 16 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 // Observers who will be notified when menu changes. | 55 // Observers who will be notified when menu changes. |
| 56 ObserverList<Observer> observers_; | 56 ObserverList<Observer> observers_; |
| 57 | 57 |
| 58 DISALLOW_COPY_AND_ASSIGN(InputMethodMenuManager); | 58 DISALLOW_COPY_AND_ASSIGN(InputMethodMenuManager); |
| 59 }; | 59 }; |
| 60 | 60 |
| 61 } // namespace ime | 61 } // namespace ime |
| 62 } // namespace ui | 62 } // namespace ui |
| 63 | 63 |
| 64 #endif // UI_CHROMEOS_IME_INPUT_METHOD_MENU_MANAGER_H_ | 64 #endif // UI_CHROMEOS_IME_INPUT_METHOD_MENU_MANAGER_H_ |
| OLD | NEW |