| 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/active_tab_permission_granter.h" | 5 #include "chrome/browser/extensions/active_tab_permission_granter.h" |
| 6 #include "chrome/browser/extensions/browser_action_test_util.h" | 6 #include "chrome/browser/extensions/browser_action_test_util.h" |
| 7 #include "chrome/browser/extensions/extension_action.h" | 7 #include "chrome/browser/extensions/extension_action.h" |
| 8 #include "chrome/browser/extensions/extension_action_manager.h" | 8 #include "chrome/browser/extensions/extension_action_manager.h" |
| 9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
| 10 #include "chrome/browser/extensions/tab_helper.h" | 10 #include "chrome/browser/extensions/tab_helper.h" |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 // This test validates that the getAll query API function returns registered | 190 // This test validates that the getAll query API function returns registered |
| 191 // commands as well as synthesized ones and that inactive commands (like the | 191 // commands as well as synthesized ones and that inactive commands (like the |
| 192 // synthesized ones are in nature) have no shortcuts. | 192 // synthesized ones are in nature) have no shortcuts. |
| 193 IN_PROC_BROWSER_TEST_F(CommandsApiTest, SynthesizedCommand) { | 193 IN_PROC_BROWSER_TEST_F(CommandsApiTest, SynthesizedCommand) { |
| 194 ASSERT_TRUE(test_server()->Start()); | 194 ASSERT_TRUE(test_server()->Start()); |
| 195 ASSERT_TRUE(RunExtensionTest("keybinding/synthesized")) << message_; | 195 ASSERT_TRUE(RunExtensionTest("keybinding/synthesized")) << message_; |
| 196 } | 196 } |
| 197 | 197 |
| 198 // This test validates that an extension cannot request a shortcut that is | 198 // This test validates that an extension cannot request a shortcut that is |
| 199 // already in use by Chrome. | 199 // already in use by Chrome. |
| 200 IN_PROC_BROWSER_TEST_F(CommandsApiTest, DontOverwriteSystemShortcuts) { | 200 // Flaky, see http://crbug.com/233372. |
| 201 IN_PROC_BROWSER_TEST_F(CommandsApiTest, DISABLED_DontOverwriteSystemShortcuts) { |
| 201 ASSERT_TRUE(test_server()->Start()); | 202 ASSERT_TRUE(test_server()->Start()); |
| 202 ASSERT_TRUE(RunExtensionTest("keybinding/dont_overwrite_system")) << message_; | 203 ASSERT_TRUE(RunExtensionTest("keybinding/dont_overwrite_system")) << message_; |
| 203 | 204 |
| 204 ui_test_utils::NavigateToURL(browser(), | 205 ui_test_utils::NavigateToURL(browser(), |
| 205 test_server()->GetURL("files/extensions/test_file.txt")); | 206 test_server()->GetURL("files/extensions/test_file.txt")); |
| 206 | 207 |
| 207 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); | 208 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); |
| 208 ASSERT_TRUE(tab); | 209 ASSERT_TRUE(tab); |
| 209 | 210 |
| 210 // Activate the shortcut (Alt+Shift+F) to make page blue. | 211 // Activate the shortcut (Alt+Shift+F) to make page blue. |
| (...skipping 18 matching lines...) Expand all Loading... |
| 229 ASSERT_TRUE(content::ExecuteScriptAndExtractBool( | 230 ASSERT_TRUE(content::ExecuteScriptAndExtractBool( |
| 230 tab, | 231 tab, |
| 231 "setInterval(function() {" | 232 "setInterval(function() {" |
| 232 " if (document.body.bgColor == 'blue') {" | 233 " if (document.body.bgColor == 'blue') {" |
| 233 " window.domAutomationController.send(true)}}, 100)", | 234 " window.domAutomationController.send(true)}}, 100)", |
| 234 &result)); | 235 &result)); |
| 235 ASSERT_TRUE(result); | 236 ASSERT_TRUE(result); |
| 236 } | 237 } |
| 237 | 238 |
| 238 } // extensions | 239 } // extensions |
| OLD | NEW |