| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "chrome/browser/chromeos/input_method/input_method_util.h" | |
| 12 #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h" | 11 #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h" |
| 13 #include "chrome/test/base/in_process_browser_test.h" | 12 #include "chrome/test/base/in_process_browser_test.h" |
| 14 #include "content/public/test/browser_test_utils.h" | 13 #include "content/public/test/browser_test_utils.h" |
| 15 #include "content/public/test/test_utils.h" | 14 #include "content/public/test/test_utils.h" |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 17 #include "ui/base/ime/chromeos/component_extension_ime_manager.h" | 16 #include "ui/base/ime/chromeos/component_extension_ime_manager.h" |
| 18 #include "ui/base/ime/chromeos/extension_ime_util.h" | 17 #include "ui/base/ime/chromeos/extension_ime_util.h" |
| 19 #include "ui/base/ime/chromeos/ime_candidate_window_handler_interface.h" | 18 #include "ui/base/ime/chromeos/ime_candidate_window_handler_interface.h" |
| 20 #include "ui/base/ime/chromeos/input_method_manager.h" | 19 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 20 #include "ui/base/ime/chromeos/input_method_util.h" |
| 21 #include "ui/base/ime/chromeos/input_method_whitelist.h" | 21 #include "ui/base/ime/chromeos/input_method_whitelist.h" |
| 22 #include "ui/base/ime/ime_bridge.h" | 22 #include "ui/base/ime/ime_bridge.h" |
| 23 #include "ui/base/ime/input_method_factory.h" | 23 #include "ui/base/ime/input_method_factory.h" |
| 24 #include "ui/display/display.h" | 24 #include "ui/display/display.h" |
| 25 #include "ui/views/widget/widget.h" | 25 #include "ui/views/widget/widget.h" |
| 26 #include "ui/views/widget/widget_observer.h" | 26 #include "ui/views/widget/widget_observer.h" |
| 27 | 27 |
| 28 namespace chromeos { | 28 namespace chromeos { |
| 29 namespace input_method { | 29 namespace input_method { |
| 30 | 30 |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 // When a new mode indicator is displayed, the previous one should be | 222 // When a new mode indicator is displayed, the previous one should be |
| 223 // closed. | 223 // closed. |
| 224 content::RunAllPendingInMessageLoop(); | 224 content::RunAllPendingInMessageLoop(); |
| 225 EXPECT_EQ(1UL, observer.widget_list_size()); | 225 EXPECT_EQ(1UL, observer.widget_list_size()); |
| 226 const views::Widget* widget2 = observer.widget_list()[0]; | 226 const views::Widget* widget2 = observer.widget_list()[0]; |
| 227 EXPECT_NE(widget1, widget2); | 227 EXPECT_NE(widget1, widget2); |
| 228 } | 228 } |
| 229 } | 229 } |
| 230 } // namespace input_method | 230 } // namespace input_method |
| 231 } // namespace chromeos | 231 } // namespace chromeos |
| OLD | NEW |