Chromium Code Reviews| 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 "ash/shell.h" | 5 #include "ash/shell.h" |
| 6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
| 7 #include "chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h" | 7 #include "chrome/browser/chromeos/extensions/virtual_keyboard_browsertest.h" |
| 8 #include "chrome/browser/extensions/crx_installer.h" | 8 #include "chrome/browser/extensions/crx_installer.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/extensions/extension_test_notification_observer.h" | 10 #include "chrome/browser/extensions/extension_test_notification_observer.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/test/base/ui_test_utils.h" | 13 #include "chrome/test/base/ui_test_utils.h" |
| 14 #include "chromeos/ime/extension_ime_util.h" | 14 #include "chromeos/ime/extension_ime_util.h" |
| 15 #include "chromeos/ime/input_method_manager.h" | 15 #include "chromeos/ime/input_method_manager.h" |
| 16 #include "content/public/browser/render_view_host.h" | 16 #include "content/public/browser/render_view_host.h" |
| 17 #include "content/public/browser/site_instance.h" | 17 #include "content/public/browser/site_instance.h" |
| 18 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
| 19 #include "content/public/common/url_constants.h" | |
| 19 #include "content/public/test/browser_test_utils.h" | 20 #include "content/public/test/browser_test_utils.h" |
| 20 #include "extensions/common/constants.h" | 21 #include "extensions/common/constants.h" |
| 21 #include "extensions/common/extension.h" | 22 #include "extensions/common/extension.h" |
| 22 #include "extensions/common/file_util.h" | 23 #include "extensions/common/file_util.h" |
| 23 #include "ui/aura/client/aura_constants.h" | 24 #include "ui/aura/client/aura_constants.h" |
| 24 #include "ui/base/ime/input_method.h" | 25 #include "ui/base/ime/input_method.h" |
| 25 | 26 |
| 26 namespace { | 27 namespace { |
| 27 | 28 |
| 28 const base::FilePath::CharType kExtensionName[] = "GoogleKeyboardInput-xkb.crx"; | 29 const base::FilePath::CharType kExtensionName[] = "GoogleKeyboardInput-xkb.crx"; |
| 29 | 30 |
| 30 const base::FilePath::CharType kInputViewTestDir[] = | 31 const base::FilePath::CharType kInputViewTestDir[] = |
| 31 "chromeos/virtual_keyboard/inputview/"; | 32 "chromeos/virtual_keyboard/inputview/"; |
| 32 const base::FilePath::CharType kBaseKeyboardTestFramework[] = "test_base.js"; | 33 const base::FilePath::CharType kBaseKeyboardTestFramework[] = "test_base.js"; |
| 33 | 34 |
| 34 const char kDefaultLayout[] = "us"; | 35 const char kDefaultLayout[] = "us"; |
| 35 const char kCompactLayout[] = "us.compact"; | 36 const char kCompactLayout[] = "us.compact"; |
| 36 | 37 |
| 37 struct InputViewConfig : public VirtualKeyboardBrowserTestConfig { | 38 struct InputViewConfig : public VirtualKeyboardBrowserTestConfig { |
| 38 explicit InputViewConfig(std::string id, std::string layout) { | 39 explicit InputViewConfig(std::string id, std::string layout) { |
| 39 base_framework_ = kBaseKeyboardTestFramework; | 40 base_framework_ = kBaseKeyboardTestFramework; |
| 40 extension_id_ = id; | 41 extension_id_ = id; |
| 41 test_dir_ = kInputViewTestDir; | 42 test_dir_ = kInputViewTestDir; |
| 42 url_ = "chrome-extension://" + id + "/inputview.html?id=" + layout; | 43 url_ = std::string(extensions::kExtensionScheme) + |
| 44 content::kStandardSchemeSeparator + id + "/inputview.html?id=" + layout; | |
|
Lei Zhang
2014/05/29 05:21:24
For line continuations, it's 4 space indentation.
| |
| 43 } | 45 } |
| 44 }; | 46 }; |
| 45 | 47 |
| 46 } // namespace | 48 } // namespace |
| 47 | 49 |
| 48 class InputViewBrowserTest : public VirtualKeyboardBrowserTest { | 50 class InputViewBrowserTest : public VirtualKeyboardBrowserTest { |
| 49 public: | 51 public: |
| 50 // Installs the IME Extension keyboard |kExtensionName|. | 52 // Installs the IME Extension keyboard |kExtensionName|. |
| 51 std::string InstallIMEExtension() { | 53 std::string InstallIMEExtension() { |
| 52 // Loads extension. | 54 // Loads extension. |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 98 RunTest(base::FilePath("keyset_transition_test.js"), | 100 RunTest(base::FilePath("keyset_transition_test.js"), |
| 99 InputViewConfig(id, kDefaultLayout)); | 101 InputViewConfig(id, kDefaultLayout)); |
| 100 } | 102 } |
| 101 | 103 |
| 102 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, CompactKeysetTransitionTest) { | 104 IN_PROC_BROWSER_TEST_F(InputViewBrowserTest, CompactKeysetTransitionTest) { |
| 103 std::string id = InstallIMEExtension(); | 105 std::string id = InstallIMEExtension(); |
| 104 ASSERT_FALSE(id.empty()); | 106 ASSERT_FALSE(id.empty()); |
| 105 RunTest(base::FilePath("keyset_transition_test.js"), | 107 RunTest(base::FilePath("keyset_transition_test.js"), |
| 106 InputViewConfig(id, kCompactLayout)); | 108 InputViewConfig(id, kCompactLayout)); |
| 107 } | 109 } |
| OLD | NEW |