Move a bunch of files into webkit/api/src...

webkit/api/src/WebPopupMenuImpl.h

Index: webkit/api/src/WebPopupMenuImpl.h
===================================================================
--- webkit/api/src/WebPopupMenuImpl.h	(revision 30163)
+++ webkit/api/src/WebPopupMenuImpl.h	(working copy)
@@ -1,15 +1,44 @@
-// 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.
+/*
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
-#ifndef WEBKIT_GLUE_WEBPOPUPMENU_IMPL_H_
-#define WEBKIT_GLUE_WEBPOPUPMENU_IMPL_H_
+#ifndef WebPopupMenuImpl_h
+#define WebPopupMenuImpl_h
 
-#include "webkit/api/public/WebPoint.h"
-#include "webkit/api/public/WebPopupMenu.h"
-#include "webkit/api/public/WebSize.h"
+// FIXME: Add this to FramelessScrollViewClient.h
+namespace WebCore { class FramelessScrollView; }
 
 #include "FramelessScrollViewClient.h"
+// FIXME: remove the relative paths once glue/ consumers are removed.
+#include "../public/WebPoint.h"
+#include "../public/WebPopupMenu.h"
+#include "../public/WebSize.h"
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
@@ -27,82 +56,73 @@
 class WebMouseEvent;
 class WebMouseWheelEvent;
 struct WebRect;
-}
 
-struct MenuItem;
-
-class WebPopupMenuImpl : public WebKit::WebPopupMenu,
+class WebPopupMenuImpl : public WebPopupMenu,
                          public WebCore::FramelessScrollViewClient,
                          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();
-  virtual void setFocus(bool enable);
-  virtual bool handleCompositionEvent(WebKit::WebCompositionCommand command,
-                                      int cursor_position,
-                                      int target_start,
-                                      int target_end,
-                                      const WebKit::WebString& text);
-  virtual bool queryCompositionStatus(bool* enabled,
-                                      WebKit::WebRect* caret_rect);
-  virtual void setTextDirection(WebKit::WebTextDirection direction);
+public:
+    // WebWidget
+    virtual void close();
+    virtual WebSize size() { return m_size; }
+    virtual void resize(const WebSize&);
+    virtual void layout();
+    virtual void paint(WebCanvas* canvas, const WebRect& rect);
+    virtual bool handleInputEvent(const WebInputEvent&);
+    virtual void mouseCaptureLost();
+    virtual void setFocus(bool enable);
+    virtual bool handleCompositionEvent(
+        WebCompositionCommand command, int cursorPosition,
+        int targetStart, int targetEnd, const WebString& text);
+    virtual bool queryCompositionStatus(bool* enabled, WebRect* caretRect);
+    virtual void setTextDirection(WebTextDirection direction);
 
-  // WebPopupMenuImpl
-  void Init(WebCore::FramelessScrollView* widget,
-            const WebKit::WebRect& bounds);
+    // WebPopupMenuImpl
+    void Init(WebCore::FramelessScrollView* widget,
+              const WebRect& bounds);
 
-  WebKit::WebWidgetClient* client() {
-    return client_;
-  }
+    WebWidgetClient* client() { return m_client; }
 
-  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);
+    void MouseMove(const WebMouseEvent&);
+    void MouseLeave(const WebMouseEvent&);
+    void MouseDown(const WebMouseEvent&);
+    void MouseUp(const WebMouseEvent&);
+    void MouseDoubleClick(const WebMouseEvent&);
+    void MouseWheel(const WebMouseWheelEvent&);
+    bool KeyEvent(const WebKeyboardEvent&);
 
- protected:
-  friend class WebKit::WebPopupMenu;  // For WebPopupMenu::create
-  friend class WTF::RefCounted<WebPopupMenuImpl>;
+   protected:
+    friend class WebPopupMenu;  // For WebPopupMenu::create
+    friend class WTF::RefCounted<WebPopupMenuImpl>;
 
-  WebPopupMenuImpl(WebKit::WebWidgetClient* client);
-  ~WebPopupMenuImpl();
+    WebPopupMenuImpl(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,
-                      const WebCore::IntRect& scroll_rect,
-                      const WebCore::IntRect& clip_rect);
-  virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const;
-  virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const;
-  virtual PlatformPageClient platformPageClient() const { return NULL; }
-  virtual void scrollRectIntoView(const WebCore::IntRect&,
-                                  const WebCore::ScrollView*) const;
-  virtual void scrollbarsModeDidChange() const;
+    // WebCore::HostWindow methods:
+    virtual void repaint(
+        const WebCore::IntRect&, bool contentChanged, bool immediate = false,
+        bool repaintContentOnly = false);
+    virtual void scroll(
+        const WebCore::IntSize& scrollDelta, const WebCore::IntRect& scrollRect,
+        const WebCore::IntRect& clipRect);
+    virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const;
+    virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const;
+    virtual PlatformPageClient platformPageClient() const { return 0; }
+    virtual void scrollRectIntoView(const WebCore::IntRect&, const WebCore::ScrollView*) const;
+    virtual void scrollbarsModeDidChange() const;
 
-  // WebCore::FramelessScrollViewClient methods:
-  virtual void popupClosed(WebCore::FramelessScrollView* popup_view);
+    // WebCore::FramelessScrollViewClient methods:
+    virtual void popupClosed(WebCore::FramelessScrollView*);
 
-  WebKit::WebWidgetClient* client_;
-  WebKit::WebSize size_;
+    WebWidgetClient* m_client;
+    WebSize m_size;
 
-  WebKit::WebPoint last_mouse_position_;
+    WebPoint m_lastMousePosition;
 
-  // This is a non-owning ref.  The popup will notify us via popupClosed()
-  // before it is destroyed.
-  WebCore::FramelessScrollView* widget_;
+    // This is a non-owning ref.  The popup will notify us via popupClosed()
+    // before it is destroyed.
+    WebCore::FramelessScrollView* m_widget;
 };
 
-#endif  // WEBKIT_GLUE_WEBPOPUPMENU_IMPL_H_
+} // namespace WebKit
+
+#endif