Refactoring select popup on Mac....

chrome/browser/renderer_host/render_widget_host_view_mac.h

 // Copyright (c) 2006-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.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/CALayer.h>
 
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "chrome/browser/accessibility/browser_accessibility_delegate_mac.h"
 #include "chrome/browser/accessibility/browser_accessibility_manager.h"
 #include "chrome/browser/cocoa/base_view.h"
 #include "chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/common/edit_command.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "webkit/glue/webcursor.h"
-#include "webkit/glue/webmenuitem.h"
 
 @class AcceleratedPluginView;
 class RenderWidgetHostViewMac;
 class RWHVMEditCommandHelper;
 @class ToolTip;
 
 @protocol RenderWidgetHostViewMacOwner
 - (RenderWidgetHostViewMac*)renderWidgetHostViewMac;
 @end
 
@@ skipping 167 matching lines @@
       const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy,
       const std::vector<gfx::Rect>& copy_rects);
   virtual void RenderViewGone();
   virtual void WillDestroyRenderWidget(RenderWidgetHost* rwh) {};
   virtual void Destroy();
   virtual void SetTooltipText(const std::wstring& tooltip_text);
   virtual void SelectionChanged(const std::string& text);
   virtual BackingStore* AllocBackingStore(const gfx::Size& size);
   virtual VideoLayer* AllocVideoLayer(const gfx::Size& size);
   virtual void SetTakesFocusOnlyOnMouseDown(bool flag);
-  virtual void ShowPopupWithItems(gfx::Rect bounds,
-                                  int item_height,
-                                  double item_font_size,
-                                  int selected_item,
-                                  const std::vector<WebMenuItem>& items,
-                                  bool right_aligned);
   virtual gfx::Rect GetWindowRect();
   virtual gfx::Rect GetRootWindowRect();
   virtual void SetActive(bool active);
   virtual void SetWindowVisibility(bool visible);
   virtual void WindowFrameChanged();
   virtual void SetBackground(const SkBitmap& background);
   virtual bool ContainsNativeView(gfx::NativeView native_view) const;
 
   virtual void OnAccessibilityNotifications(
       const std::vector<ViewHostMsg_AccessibilityNotification_Params>& params);
@@ skipping 30 matching lines @@
       gfx::PluginWindowHandle plugin_handle,
       NSSize size);
   // Forces the textures associated with any accelerated plugin instances
   // to be reloaded.
   void ForceTextureReload();
 
   virtual void SetVisuallyDeemphasized(bool deemphasized);
 
   void KillSelf();
 
-  void set_parent_view(NSView* parent_view) { parent_view_ = parent_view; }
-
   void SetTextInputActive(bool active);
 
   // Sends confirmed plugin IME text back to the renderer.
   void PluginImeCompositionConfirmed(const string16& text, int plugin_id);
 
   const std::string& selected_text() const { return selected_text_; }
 
   // These member variables should be private, but the associated ObjC class
   // needs access to them and can't be made a friend.
 
@@ skipping 41 matching lines @@
   void UpdateCursorIfOverSelf();
 
   // Shuts down the render_widget_host_.  This is a separate function so we can
   // invoke it from the message loop.
   void ShutdownHost();
 
   // Used to determine whether or not to enable accessibility.
   bool IsVoiceOverRunning();
 
   // The associated view. This is weak and is inserted into the view hierarchy
-  // to own this RenderWidgetHostViewMac object unless is_popup_menu_ is true.
-  // In that case, cocoa_view_ is never inserted into the view hierarchy, so
-  // the RenderWidgetHostViewMac will treat it as a strong reference and will
-  // release it when told to destroy (for example, because a pop-up menu has
-  // closed).
+  // to own this RenderWidgetHostViewMac object.
   RenderWidgetHostViewCocoa* cocoa_view_;
 
   // The cursor for the page. This is passed up from the renderer.
   WebCursor current_cursor_;
 
   // Indicates if the page is loading.
   bool is_loading_;
 
   // true if the View is not visible.
   bool is_hidden_;
 
-  // True if the widget is a native popup menu.  The renderer code calls this
-  // an "external popup."
-  bool is_popup_menu_;
-
   // The text to be shown in the tooltip, supplied by the renderer.
   std::wstring tooltip_text_;
 
   // Factory used to safely scope delayed calls to ShutdownHost().
   ScopedRunnableMethodFactory<RenderWidgetHostViewMac> shutdown_factory_;
 
-  // Used for positioning a popup menu.
-  NSView* parent_view_;
-
   // selected text on the renderer.
   std::string selected_text_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_