| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| 11 #include "base/prefs/pref_service.h" |
| 11 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
| 12 #include "chrome/browser/chromeos/extensions/input_method_event_router.h" | 13 #include "chrome/browser/chromeos/extensions/input_method_event_router.h" |
| 13 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 14 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| 15 #include "chrome/common/pref_names.h" |
| 16 #include "chromeos/chromeos_switches.h" |
| 14 #include "content/public/browser/notification_observer.h" | 17 #include "content/public/browser/notification_observer.h" |
| 15 #include "content/public/browser/notification_registrar.h" | 18 #include "content/public/browser/notification_registrar.h" |
| 16 #include "content/public/browser/notification_service.h" | 19 #include "content/public/browser/notification_service.h" |
| 17 #include "extensions/common/switches.h" | 20 #include "extensions/common/switches.h" |
| 18 #include "extensions/browser/api/test/test_api.h" | 21 #include "extensions/browser/api/test/test_api.h" |
| 19 #include "extensions/browser/notification_types.h" | 22 #include "extensions/browser/notification_types.h" |
| 20 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
| 21 #include "ui/base/ime/chromeos/extension_ime_util.h" | 24 #include "ui/base/ime/chromeos/extension_ime_util.h" |
| 22 #include "ui/base/ime/chromeos/input_method_manager.h" | 25 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 23 | 26 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 private: | 65 private: |
| 63 content::NotificationRegistrar registrar_; | 66 content::NotificationRegistrar registrar_; |
| 64 }; | 67 }; |
| 65 | 68 |
| 66 class ExtensionInputMethodApiTest : public ExtensionApiTest { | 69 class ExtensionInputMethodApiTest : public ExtensionApiTest { |
| 67 void SetUpCommandLine(base::CommandLine* command_line) override { | 70 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 68 ExtensionApiTest::SetUpCommandLine(command_line); | 71 ExtensionApiTest::SetUpCommandLine(command_line); |
| 69 command_line->AppendSwitchASCII( | 72 command_line->AppendSwitchASCII( |
| 70 extensions::switches::kWhitelistedExtensionID, | 73 extensions::switches::kWhitelistedExtensionID, |
| 71 "ilanclmaeigfpnmdlgelmhkpkegdioip"); | 74 "ilanclmaeigfpnmdlgelmhkpkegdioip"); |
| 75 command_line->AppendSwitch(chromeos::switches::kEnableImeMenu); |
| 72 } | 76 } |
| 73 }; | 77 }; |
| 74 | 78 |
| 75 } // namespace | 79 } // namespace |
| 76 | 80 |
| 77 IN_PROC_BROWSER_TEST_F(ExtensionInputMethodApiTest, Basic) { | 81 IN_PROC_BROWSER_TEST_F(ExtensionInputMethodApiTest, Basic) { |
| 78 // Listener for extension's background ready. | 82 // Listener for extension's background ready. |
| 79 TestListener listener; | 83 TestListener listener; |
| 80 | 84 |
| 85 browser()->profile()->GetPrefs()->SetBoolean(prefs::kLangugaeImeMenuActivated, |
| 86 true); |
| 81 ASSERT_TRUE(RunExtensionTest("input_method")) << message_; | 87 ASSERT_TRUE(RunExtensionTest("input_method")) << message_; |
| 82 } | 88 } |
| OLD | NEW |