Chrome side of the WebKit popup changes.

webkit/tools/test_shell/mac/test_webview_delegate.mm

 // Copyright (c) 2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 #import <Cocoa/Cocoa.h>
 #include "base/sys_string_conversions.h"
 #include "base/string_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webview.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using WebKit::WebRect;
 
 // MenuDelegate ----------------------------------------------------------------
 // A class for determining whether an item was selected from an HTML select
 // control, or if the menu was dismissed without making a selection. If a menu
 // item is selected, MenuDelegate is informed and sets a flag which can be
 // queried after the menu has finished running.
 
 @interface MenuDelegate : NSObject {
  @private
   NSMenu* menu_;  // Non-owning
   BOOL menuItemWasChosen_;
 }
-- (id)initWithItems:(const std::vector<MenuItem>&)items forMenu:(NSMenu*)menu;
-- (void)addItem:(const MenuItem&)item;
+- (id)initWithItems:(const std::vector<WebMenuItem>&)items
+            forMenu:(NSMenu*)menu;
+- (void)addItem:(const WebMenuItem&)item;
 - (BOOL)menuItemWasChosen;
 - (void)menuItemSelected:(id)sender;
 @end
 
 @implementation MenuDelegate
 
-- (id)initWithItems:(const std::vector<MenuItem>&)items forMenu:(NSMenu*)menu {
+- (id)initWithItems:(const std::vector<WebMenuItem>&)items
+            forMenu:(NSMenu*)menu {
   if ((self = [super init])) {
     menu_ = menu;
     menuItemWasChosen_ = NO;
     for (int i = 0; i < static_cast<int>(items.size()); ++i)
       [self addItem:items[i]];
   }
   return self;
 }
 
-- (void)addItem:(const MenuItem&)item {
-  if (item.type == MenuItem::SEPARATOR) {
+- (void)addItem:(const WebMenuItem&)item {
+  if (item.type == WebMenuItem::SEPARATOR) {
     [menu_ addItem:[NSMenuItem separatorItem]];
     return;
   }
 
   NSString* title = base::SysUTF16ToNSString(item.label);
   NSMenuItem* menu_item = [menu_ addItemWithTitle:title
                                            action:@selector(menuItemSelected:)
                                     keyEquivalent:@""];
-  [menu_item setEnabled:(item.enabled && item.type != MenuItem::GROUP)];
+  [menu_item setEnabled:(item.enabled && item.type != WebMenuItem::GROUP)];
   [menu_item setTarget:self];
 }
 
 // Reflects the result of the user's interaction with the popup menu. If NO, the
 // menu was dismissed without the user choosing an item, which can happen if the
 // user clicked outside the menu region or hit the escape key. If YES, the user
 // selected an item from the menu.
 - (BOOL)menuItemWasChosen {
   return menuItemWasChosen_;
 }
@@ skipping 46 matching lines @@
 }
 
 
 // WebWidgetDelegate ---------------------------------------------------------
 
 void TestWebViewDelegate::Show(WebWidget* webview,
                                WindowOpenDisposition disposition) {
 }
 
 // Display a HTML select menu.
-void TestWebViewDelegate::ShowWithItems(
+void TestWebViewDelegate::ShowAsPopupWithItems(
     WebWidget* webview,
     const WebRect& bounds,
     int item_height,
     int selected_index,
-    const std::vector<MenuItem>& items) {
+    const std::vector<WebMenuItem>& items) {
   // Populate the menu.
   NSMenu* menu = [[[NSMenu alloc] initWithTitle:@""] autorelease];
   [menu setAutoenablesItems:NO];
   MenuDelegate* menu_delegate =
       [[[MenuDelegate alloc] initWithItems:items forMenu:menu] autorelease];
 
   // Set up the button cell, converting to NSView coordinates. The menu is
   // positioned such that the currently selected menu item appears over the
   // popup button, which is the expected Mac popup menu behavior.
   NSPopUpButtonCell* button = [[NSPopUpButtonCell alloc] initTextCell:@""
@@ skipping 163 matching lines @@
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   [[shell_->webViewHost()->view_handle() window]
       setTitle:[NSString stringWithUTF8String:WideToUTF8(title).c_str()]];
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   const char* frameURL = url.spec().c_str();
   NSString *address = [NSString stringWithUTF8String:frameURL];
   [shell_->editWnd() setStringValue:address];
 }