Minor cleanup in glue to remove some remaining base dependencies....

webkit/glue/webpopupmenu_impl.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 WEBKIT_GLUE_WEBPOPUPMENU_IMPL_H_
 #define WEBKIT_GLUE_WEBPOPUPMENU_IMPL_H_
 
-#include "base/basictypes.h"
-#include "base/ref_counted.h"
 #include "webkit/api/public/WebPoint.h"
 #include "webkit/api/public/WebPopupMenu.h"
 #include "webkit/api/public/WebSize.h"
 
 #include "FramelessScrollViewClient.h"
+#include <wtf/RefCounted.h>
 
 namespace WebCore {
 class Frame;
 class FramelessScrollView;
 class KeyboardEvent;
 class Page;
 class PlatformKeyboardEvent;
 class Range;
 class Widget;
 }
 
 namespace WebKit {
 class WebKeyboardEvent;
 class WebMouseEvent;
 class WebMouseWheelEvent;
 struct WebRect;
 }
 
 struct MenuItem;
 
 class WebPopupMenuImpl : public WebKit::WebPopupMenu,
                          public WebCore::FramelessScrollViewClient,
-                         public base::RefCounted<WebPopupMenuImpl> {
+                         public RefCounted<WebPopupMenuImpl> {
  public:
   // WebWidget
   virtual void close();
   virtual WebKit::WebSize size() { return size_; }
   virtual void resize(const WebKit::WebSize& new_size);
   virtual void layout();
   virtual void paint(WebKit::WebCanvas* canvas,
                      const WebKit::WebRect& rect);
   virtual bool handleInputEvent(const WebKit::WebInputEvent& input_event);
   virtual void mouseCaptureLost();
@@ skipping 18 matching lines @@
   void MouseMove(const WebKit::WebMouseEvent& mouse_event);
   void MouseLeave(const WebKit::WebMouseEvent& mouse_event);
   void MouseDown(const WebKit::WebMouseEvent& mouse_event);
   void MouseUp(const WebKit::WebMouseEvent& mouse_event);
   void MouseDoubleClick(const WebKit::WebMouseEvent& mouse_event);
   void MouseWheel(const WebKit::WebMouseWheelEvent& wheel_event);
   bool KeyEvent(const WebKit::WebKeyboardEvent& key_event);
 
  protected:
   friend class WebKit::WebPopupMenu;  // For WebPopupMenu::create
-  friend class base::RefCounted<WebPopupMenuImpl>;
+  friend class WTF::RefCounted<WebPopupMenuImpl>;
 
   WebPopupMenuImpl(WebKit::WebWidgetClient* client);
   ~WebPopupMenuImpl();
 
   // WebCore::HostWindow methods:
   virtual void repaint(const WebCore::IntRect&,
                        bool content_changed,
                        bool immediate = false,
                        bool repaint_content_only = false);
   virtual void scroll(const WebCore::IntSize& scroll_delta,
@@ skipping 10 matching lines @@
   virtual void popupClosed(WebCore::FramelessScrollView* popup_view);
 
   WebKit::WebWidgetClient* client_;
   WebKit::WebSize size_;
 
   WebKit::WebPoint last_mouse_position_;
 
   // This is a non-owning ref.  The popup will notify us via popupClosed()
   // before it is destroyed.
   WebCore::FramelessScrollView* widget_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(WebPopupMenuImpl);
 };
 
 #endif  // WEBKIT_GLUE_WEBPOPUPMENU_IMPL_H_