| 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/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
| 10 #include "chrome/browser/extensions/extension_browsertest.h" | 10 #include "chrome/browser/extensions/extension_browsertest.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #include "testing/gtest/include/gtest/gtest.h" | 26 #include "testing/gtest/include/gtest/gtest.h" |
| 27 | 27 |
| 28 #if defined(OS_MACOSX) | 28 #if defined(OS_MACOSX) |
| 29 #include "base/mac/scoped_nsautorelease_pool.h" | 29 #include "base/mac/scoped_nsautorelease_pool.h" |
| 30 #endif | 30 #endif |
| 31 | 31 |
| 32 using extensions::Extension; | 32 using extensions::Extension; |
| 33 | 33 |
| 34 class PanelExtensionBrowserTest : public ExtensionBrowserTest { | 34 class PanelExtensionBrowserTest : public ExtensionBrowserTest { |
| 35 protected: | 35 protected: |
| 36 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 36 virtual void SetUpCommandLine(CommandLine* command_line) override { |
| 37 ExtensionBrowserTest::SetUpCommandLine(command_line); | 37 ExtensionBrowserTest::SetUpCommandLine(command_line); |
| 38 command_line->AppendSwitch(switches::kEnablePanels); | 38 command_line->AppendSwitch(switches::kEnablePanels); |
| 39 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); | 39 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); |
| 40 test_data_dir_ = test_data_dir_.AppendASCII("panels"); | 40 test_data_dir_ = test_data_dir_.AppendASCII("panels"); |
| 41 } | 41 } |
| 42 | 42 |
| 43 Panel* CreatePanelFromExtension(const Extension* extension) const { | 43 Panel* CreatePanelFromExtension(const Extension* extension) const { |
| 44 #if defined(OS_MACOSX) | 44 #if defined(OS_MACOSX) |
| 45 // Opening panels on a Mac causes NSWindowController of the Panel window | 45 // Opening panels on a Mac causes NSWindowController of the Panel window |
| 46 // to be autoreleased. We need a pool drained after it's done so the test | 46 // to be autoreleased. We need a pool drained after it's done so the test |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 : RenderViewContextMenu(render_frame_host, params) {} | 120 : RenderViewContextMenu(render_frame_host, params) {} |
| 121 | 121 |
| 122 bool HasCommandWithId(int command_id) { | 122 bool HasCommandWithId(int command_id) { |
| 123 return menu_model_.GetIndexOfCommandId(command_id) != -1; | 123 return menu_model_.GetIndexOfCommandId(command_id) != -1; |
| 124 } | 124 } |
| 125 | 125 |
| 126 protected: | 126 protected: |
| 127 // RenderViewContextMenu implementation. | 127 // RenderViewContextMenu implementation. |
| 128 virtual bool GetAcceleratorForCommandId( | 128 virtual bool GetAcceleratorForCommandId( |
| 129 int command_id, | 129 int command_id, |
| 130 ui::Accelerator* accelerator) OVERRIDE { | 130 ui::Accelerator* accelerator) override { |
| 131 return false; | 131 return false; |
| 132 } | 132 } |
| 133 }; | 133 }; |
| 134 | 134 |
| 135 IN_PROC_BROWSER_TEST_F(PanelExtensionBrowserTest, BasicContextMenu) { | 135 IN_PROC_BROWSER_TEST_F(PanelExtensionBrowserTest, BasicContextMenu) { |
| 136 ExtensionTestMessageListener listener("panel loaded", false); | 136 ExtensionTestMessageListener listener("panel loaded", false); |
| 137 LoadExtension(test_data_dir_.AppendASCII("basic")); | 137 LoadExtension(test_data_dir_.AppendASCII("basic")); |
| 138 ASSERT_TRUE(listener.WaitUntilSatisfied()); | 138 ASSERT_TRUE(listener.WaitUntilSatisfied()); |
| 139 | 139 |
| 140 // There should only be one panel. | 140 // There should only be one panel. |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPYLINKLOCATION)); | 268 EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPYLINKLOCATION)); |
| 269 | 269 |
| 270 // Execute the extension's custom menu item and wait for the extension's | 270 // Execute the extension's custom menu item and wait for the extension's |
| 271 // script to tell us its onclick fired. | 271 // script to tell us its onclick fired. |
| 272 ExtensionTestMessageListener onclick_listener("clicked", false); | 272 ExtensionTestMessageListener onclick_listener("clicked", false); |
| 273 int command_id = IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST; | 273 int command_id = IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST; |
| 274 ASSERT_TRUE(menu->IsCommandIdEnabled(command_id)); | 274 ASSERT_TRUE(menu->IsCommandIdEnabled(command_id)); |
| 275 menu->ExecuteCommand(command_id, 0); | 275 menu->ExecuteCommand(command_id, 0); |
| 276 EXPECT_TRUE(onclick_listener.WaitUntilSatisfied()); | 276 EXPECT_TRUE(onclick_listener.WaitUntilSatisfied()); |
| 277 } | 277 } |
| OLD | NEW |