OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "build/build_config.h" | 5 #include "build/build_config.h" |
6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
7 #include "chrome/browser/extensions/window_controller.h" | 7 #include "chrome/browser/extensions/window_controller.h" |
8 #include "chrome/browser/ui/browser_window.h" | 8 #include "chrome/browser/ui/browser_window.h" |
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 9 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
10 #include "chrome/test/base/interactive_test_utils.h" | 10 #include "chrome/test/base/interactive_test_utils.h" |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 // doesn't have focus. Also test that non-global commands are not treated as | 119 // doesn't have focus. Also test that non-global commands are not treated as |
120 // global and that keys beyond Ctrl+Shift+[0..9] cannot be auto-assigned by an | 120 // global and that keys beyond Ctrl+Shift+[0..9] cannot be auto-assigned by an |
121 // extension. | 121 // extension. |
122 // | 122 // |
123 // Doesn't work in GN CrOS ozone builds yet, http://crbug.com/619784 | 123 // Doesn't work in GN CrOS ozone builds yet, http://crbug.com/619784 |
124 #if defined(OS_CHROMEOS) && defined(USE_OZONE) | 124 #if defined(OS_CHROMEOS) && defined(USE_OZONE) |
125 #define MAYBE_GlobalCommand DISABLED_GlobalCommand | 125 #define MAYBE_GlobalCommand DISABLED_GlobalCommand |
126 #else | 126 #else |
127 #define MAYBE_GlobalCommand GlobalCommand | 127 #define MAYBE_GlobalCommand GlobalCommand |
128 #endif | 128 #endif |
129 IN_PROC_BROWSER_TEST_F(GlobalCommandsApiTest, GlobalCommand) { | 129 IN_PROC_BROWSER_TEST_F(GlobalCommandsApiTest, MAYBE_GlobalCommand) { |
130 // Load the extension in the non-incognito browser. | 130 // Load the extension in the non-incognito browser. |
131 ResultCatcher catcher; | 131 ResultCatcher catcher; |
132 ASSERT_TRUE(RunExtensionTest("keybinding/global")) << message_; | 132 ASSERT_TRUE(RunExtensionTest("keybinding/global")) << message_; |
133 ASSERT_TRUE(catcher.GetNextResult()); | 133 ASSERT_TRUE(catcher.GetNextResult()); |
134 | 134 |
135 #if defined(OS_WIN) || defined(OS_CHROMEOS) | 135 #if defined(OS_WIN) || defined(OS_CHROMEOS) |
136 // Our infrastructure for sending keys expects a browser to send them to, but | 136 // Our infrastructure for sending keys expects a browser to send them to, but |
137 // to properly test global shortcuts you need to send them to another target. | 137 // to properly test global shortcuts you need to send them to another target. |
138 // So, create an incognito browser to use as a target to send the shortcuts | 138 // So, create an incognito browser to use as a target to send the shortcuts |
139 // to. It will ignore all of them and allow us test whether the global | 139 // to. It will ignore all of them and allow us test whether the global |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 false, | 207 false, |
208 false, | 208 false, |
209 false); | 209 false); |
210 | 210 |
211 // We should get two success results. | 211 // We should get two success results. |
212 ASSERT_TRUE(catcher.GetNextResult()); | 212 ASSERT_TRUE(catcher.GetNextResult()); |
213 ASSERT_TRUE(catcher.GetNextResult()); | 213 ASSERT_TRUE(catcher.GetNextResult()); |
214 } | 214 } |
215 | 215 |
216 } // namespace extensions | 216 } // namespace extensions |
OLD | NEW |