OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <algorithm> | 5 #include <algorithm> |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 8 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
9 #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h" | 9 #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h" |
10 #include "chrome/test/base/in_process_browser_test.h" | 10 #include "chrome/test/base/in_process_browser_test.h" |
11 #include "chromeos/ime/component_extension_ime_manager.h" | |
12 #include "chromeos/ime/extension_ime_util.h" | |
13 #include "chromeos/ime/input_method_manager.h" | |
14 #include "chromeos/ime/input_method_whitelist.h" | |
15 #include "content/public/test/browser_test_utils.h" | 11 #include "content/public/test/browser_test_utils.h" |
16 #include "content/public/test/test_utils.h" | 12 #include "content/public/test/test_utils.h" |
17 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 14 #include "ui/base/ime/chromeos/component_extension_ime_manager.h" |
| 15 #include "ui/base/ime/chromeos/extension_ime_util.h" |
18 #include "ui/base/ime/chromeos/ime_bridge.h" | 16 #include "ui/base/ime/chromeos/ime_bridge.h" |
| 17 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 18 #include "ui/base/ime/chromeos/input_method_whitelist.h" |
19 #include "ui/base/ime/input_method_factory.h" | 19 #include "ui/base/ime/input_method_factory.h" |
20 #include "ui/views/widget/widget.h" | 20 #include "ui/views/widget/widget.h" |
21 #include "ui/views/widget/widget_observer.h" | 21 #include "ui/views/widget/widget_observer.h" |
22 | 22 |
23 namespace chromeos { | 23 namespace chromeos { |
24 namespace input_method { | 24 namespace input_method { |
25 | 25 |
26 class ScopedModeIndicatorObserverForTesting : | 26 class ScopedModeIndicatorObserverForTesting : |
27 public ModeIndicatorObserverInterface { | 27 public ModeIndicatorObserverInterface { |
28 public: | 28 public: |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 // When a new mode indicator is displayed, the previous one should be | 214 // When a new mode indicator is displayed, the previous one should be |
215 // closed. | 215 // closed. |
216 content::RunAllPendingInMessageLoop(); | 216 content::RunAllPendingInMessageLoop(); |
217 EXPECT_EQ(1UL, observer.widget_list_size()); | 217 EXPECT_EQ(1UL, observer.widget_list_size()); |
218 const views::Widget* widget2 = observer.widget_list()[0]; | 218 const views::Widget* widget2 = observer.widget_list()[0]; |
219 EXPECT_NE(widget1, widget2); | 219 EXPECT_NE(widget1, widget2); |
220 } | 220 } |
221 } | 221 } |
222 } // namespace input_method | 222 } // namespace input_method |
223 } // namespace chromeos | 223 } // namespace chromeos |
OLD | NEW |