Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: chrome/browser/ui/panels/panel_extension_browsertest.cc

Issue 2140963002: Added default implementations of GetAcceleratorForCommandId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@acceleratorprovider-const
Patch Set: Rebase. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 public: 118 public:
119 PanelContextMenu(content::RenderFrameHost* render_frame_host, 119 PanelContextMenu(content::RenderFrameHost* render_frame_host,
120 const content::ContextMenuParams& params) 120 const content::ContextMenuParams& params)
121 : RenderViewContextMenu(render_frame_host, params) {} 121 : RenderViewContextMenu(render_frame_host, params) {}
122 122
123 bool HasCommandWithId(int command_id) { 123 bool HasCommandWithId(int command_id) {
124 return menu_model_.GetIndexOfCommandId(command_id) != -1; 124 return menu_model_.GetIndexOfCommandId(command_id) != -1;
125 } 125 }
126 126
127 void Show() override {} 127 void Show() override {}
128
129 protected:
130 // RenderViewContextMenu implementation.
131 bool GetAcceleratorForCommandId(int command_id,
132 ui::Accelerator* accelerator) const override {
133 return false;
134 }
135 }; 128 };
136 129
137 IN_PROC_BROWSER_TEST_F(PanelExtensionBrowserTest, BasicContextMenu) { 130 IN_PROC_BROWSER_TEST_F(PanelExtensionBrowserTest, BasicContextMenu) {
138 ExtensionTestMessageListener listener("panel loaded", false); 131 ExtensionTestMessageListener listener("panel loaded", false);
139 LoadExtension(test_data_dir_.AppendASCII("basic")); 132 LoadExtension(test_data_dir_.AppendASCII("basic"));
140 ASSERT_TRUE(listener.WaitUntilSatisfied()); 133 ASSERT_TRUE(listener.WaitUntilSatisfied());
141 134
142 // There should only be one panel. 135 // There should only be one panel.
143 PanelManager* panel_manager = PanelManager::GetInstance(); 136 PanelManager* panel_manager = PanelManager::GetInstance();
144 EXPECT_EQ(1, panel_manager->num_panels()); 137 EXPECT_EQ(1, panel_manager->num_panels());
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPYLINKLOCATION)); 263 EXPECT_FALSE(menu->HasCommandWithId(IDC_CONTENT_CONTEXT_COPYLINKLOCATION));
271 264
272 // Execute the extension's custom menu item and wait for the extension's 265 // Execute the extension's custom menu item and wait for the extension's
273 // script to tell us its onclick fired. 266 // script to tell us its onclick fired.
274 ExtensionTestMessageListener onclick_listener("clicked", false); 267 ExtensionTestMessageListener onclick_listener("clicked", false);
275 int command_id = IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST; 268 int command_id = IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST;
276 ASSERT_TRUE(menu->IsCommandIdEnabled(command_id)); 269 ASSERT_TRUE(menu->IsCommandIdEnabled(command_id));
277 menu->ExecuteCommand(command_id, 0); 270 menu->ExecuteCommand(command_id, 0);
278 EXPECT_TRUE(onclick_listener.WaitUntilSatisfied()); 271 EXPECT_TRUE(onclick_listener.WaitUntilSatisfied());
279 } 272 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_media_menu_model.cc ('k') | chrome/browser/ui/toolbar/app_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698