| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/memory/scoped_vector.h" | 6 #include "base/memory/scoped_vector.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 ui::PAGE_TRANSITION_TYPED, false)); | 226 ui::PAGE_TRANSITION_TYPED, false)); |
| 227 | 227 |
| 228 EXPECT_TRUE(WaitForTabsAndPopups(browser(), 3, 1, 0)); | 228 EXPECT_TRUE(WaitForTabsAndPopups(browser(), 3, 1, 0)); |
| 229 } | 229 } |
| 230 | 230 |
| 231 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowArgumentsOverflow) { | 231 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowArgumentsOverflow) { |
| 232 ASSERT_TRUE(RunExtensionTest("window_open/argument_overflow")) << message_; | 232 ASSERT_TRUE(RunExtensionTest("window_open/argument_overflow")) << message_; |
| 233 } | 233 } |
| 234 | 234 |
| 235 class WindowOpenPanelDisabledTest : public ExtensionApiTest { | 235 class WindowOpenPanelDisabledTest : public ExtensionApiTest { |
| 236 virtual void SetUpCommandLine(CommandLine* command_line) override { | 236 void SetUpCommandLine(CommandLine* command_line) override { |
| 237 ExtensionApiTest::SetUpCommandLine(command_line); | 237 ExtensionApiTest::SetUpCommandLine(command_line); |
| 238 // TODO(jennb): Re-enable when panels are enabled by default. | 238 // TODO(jennb): Re-enable when panels are enabled by default. |
| 239 // command_line->AppendSwitch(switches::kDisablePanels); | 239 // command_line->AppendSwitch(switches::kDisablePanels); |
| 240 } | 240 } |
| 241 }; | 241 }; |
| 242 | 242 |
| 243 IN_PROC_BROWSER_TEST_F(WindowOpenPanelDisabledTest, | 243 IN_PROC_BROWSER_TEST_F(WindowOpenPanelDisabledTest, |
| 244 DISABLED_WindowOpenPanelNotEnabled) { | 244 DISABLED_WindowOpenPanelNotEnabled) { |
| 245 ASSERT_TRUE(RunExtensionTest("window_open/panel_not_enabled")) << message_; | 245 ASSERT_TRUE(RunExtensionTest("window_open/panel_not_enabled")) << message_; |
| 246 } | 246 } |
| 247 | 247 |
| 248 class WindowOpenPanelTest : public ExtensionApiTest { | 248 class WindowOpenPanelTest : public ExtensionApiTest { |
| 249 virtual void SetUpCommandLine(CommandLine* command_line) override { | 249 void SetUpCommandLine(CommandLine* command_line) override { |
| 250 ExtensionApiTest::SetUpCommandLine(command_line); | 250 ExtensionApiTest::SetUpCommandLine(command_line); |
| 251 command_line->AppendSwitch(switches::kEnablePanels); | 251 command_line->AppendSwitch(switches::kEnablePanels); |
| 252 } | 252 } |
| 253 }; | 253 }; |
| 254 | 254 |
| 255 #if defined(USE_ASH_PANELS) | 255 #if defined(USE_ASH_PANELS) |
| 256 // On Ash, this currently fails because we're currently opening new panel | 256 // On Ash, this currently fails because we're currently opening new panel |
| 257 // windows as popup windows instead. | 257 // windows as popup windows instead. |
| 258 #define MAYBE_WindowOpenPanel DISABLED_WindowOpenPanel | 258 #define MAYBE_WindowOpenPanel DISABLED_WindowOpenPanel |
| 259 #else | 259 #else |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 last_loaded_extension_id() + "/newtab.html"), | 504 last_loaded_extension_id() + "/newtab.html"), |
| 505 false, | 505 false, |
| 506 &newtab)); | 506 &newtab)); |
| 507 | 507 |
| 508 // Extension API should succeed. | 508 // Extension API should succeed. |
| 509 bool result = false; | 509 bool result = false; |
| 510 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(newtab, "testExtensionApi()", | 510 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(newtab, "testExtensionApi()", |
| 511 &result)); | 511 &result)); |
| 512 EXPECT_TRUE(result); | 512 EXPECT_TRUE(result); |
| 513 } | 513 } |
| OLD | NEW |