Fix style errors in PopupContainer and PopupListBox.

Source/core/platform/chromium/PopupListBox.h

 /*
  * Copyright (c) 2011, 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 PopupListBox_h
 #define PopupListBox_h
 
 #include "core/dom/Node.h"
 #include "core/platform/chromium/FramelessScrollView.h"
 #include "core/platform/text/TextDirection.h"
-#include <wtf/text/WTFString.h>
+#include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 typedef unsigned long long TimeStamp;
 
-static const int kLabelToIconPadding = 5;
-static const int kLinePaddingHeight = 3; // Padding height put at the top and bottom of each line.
-static const int kMaxHeight = 500;
-static const int kMaxVisibleRows = 20;
-static const int kMinEndOfLinePadding = 2;
-static const int kTextToLabelPadding = 10;
-static const TimeStamp kTypeAheadTimeoutMs = 1000;
-
 class Font;
 class GraphicsContext;
 class IntRect;
 class PlatformKeyboardEvent;
 class PlatformMouseEvent;
 class PlatformGestureEvent;
 class PlatformTouchEvent;
 class PlatformWheelEvent;
 class PopupMenuClient;
 
@@ skipping 57 matching lines @@
 // This class uses WebCore code to paint and handle events for a drop-down list
 // box ("combobox" on Windows).
 class PopupListBox : public FramelessScrollView, public PopupContent {
 public:
     static PassRefPtr<PopupListBox> create(PopupMenuClient* client, const PopupContainerSettings& settings)
     {
         return adoptRef(new PopupListBox(client, settings));
     }
 
     // FramelessScrollView
-    virtual void paint(GraphicsContext*, const IntRect&);
-    virtual bool handleMouseDownEvent(const PlatformMouseEvent&);
-    virtual bool handleMouseMoveEvent(const PlatformMouseEvent&);
-    virtual bool handleMouseReleaseEvent(const PlatformMouseEvent&);
-    virtual bool handleWheelEvent(const PlatformWheelEvent&);
-    virtual bool handleKeyEvent(const PlatformKeyboardEvent&);
-    virtual bool handleTouchEvent(const PlatformTouchEvent&);
-    virtual bool handleGestureEvent(const PlatformGestureEvent&);
+    virtual void paint(GraphicsContext*, const IntRect&) OVERRIDE;
+    virtual bool handleMouseDownEvent(const PlatformMouseEvent&) OVERRIDE;
+    virtual bool handleMouseMoveEvent(const PlatformMouseEvent&) OVERRIDE;
+    virtual bool handleMouseReleaseEvent(const PlatformMouseEvent&) OVERRIDE;
+    virtual bool handleWheelEvent(const PlatformWheelEvent&) OVERRIDE;
+    virtual bool handleKeyEvent(const PlatformKeyboardEvent&) OVERRIDE;
+    virtual bool handleTouchEvent(const PlatformTouchEvent&) OVERRIDE;
+    virtual bool handleGestureEvent(const PlatformGestureEvent&) OVERRIDE;
 
     // ScrollView
-    virtual HostWindow* hostWindow() const;
+    virtual HostWindow* hostWindow() const OVERRIDE;
 
     // PopupListBox methods
 
     // Hides the popup.
     void hidePopup();
 
     // Updates our internal list to match the client.
     void updateFromElement();
 
     // Frees any allocated resources used in a particular popup session.
     void clear();
 
     // Sets the index of the option that is displayed in the <select> widget in the page
     void setOriginalIndex(int);
 
-    // Gets the index of the item that the user is currently moused over or has selected with
-    // the keyboard. This is not the same as the original index, since the user has not yet
-    // accepted this input.
+    // Gets the index of the item that the user is currently moused over or has
+    // selected with the keyboard. This is not the same as the original index,
+    // since the user has not yet accepted this input.
     int selectedIndex() const { return m_selectedIndex; }
 
     // Moves selection down/up the given number of items, scrolling if necessary.
     // Positive is down. The resulting index will be clamped to the range
     // [0, numItems), and non-option items will be skipped.
     void adjustSelectedIndex(int delta);
 
     // Returns the number of items in the list.
     int numItems() const { return static_cast<int>(m_items.size()); }
 
@@ skipping 13 matching lines @@
     void setMaxWidth(int maxWidth) { m_maxWindowWidth = maxWidth; }
 
     virtual void setMaxWidthAndLayout(int) OVERRIDE;
 
     void disconnectClient() { m_popupClient = 0; }
 
     const Vector<PopupItem*>& items() const { return m_items; }
 
     virtual int popupContentHeight() const OVERRIDE;
 
+    static const int defaultMaxHeight;
+
 private:
     friend class PopupContainer;
     friend class RefCounted<PopupListBox>;
 
     PopupListBox(PopupMenuClient*, const PopupContainerSettings&);
 
     virtual ~PopupListBox()
     {
         clear();
     }
 
     // Closes the popup
     void abandon();
 
     // Returns true if the selection can be changed to index.
     // Disabled items, or labels cannot be selected.
     bool isSelectableItem(int index);
 
     // Select an index in the list, scrolling if necessary.
     void selectIndex(int index);
 
-    // Accepts the selected index as the value to be displayed in the <select> widget on
-    // the web page, and closes the popup. Returns true if index is accepted.
+    // Accepts the selected index as the value to be displayed in the <select>
+    // widget on the web page, and closes the popup. Returns true if index is
+    // accepted.
     bool acceptIndex(int index);
 
     // Clears the selection (so no row appears selected).
     void clearSelection();
 
     // Scrolls to reveal the given index.
     void scrollToRevealRow(int index);
     void scrollToRevealSelection() { scrollToRevealRow(m_selectedIndex); }
 
     // Invalidates the row at the given index.
@@ skipping 18 matching lines @@
     Font getRowFont(int index);
 
     // Moves the selection down/up one item, taking care of looping back to the
     // first/last element if m_loopSelectionNavigation is true.
     void selectPreviousRow();
     void selectNextRow();
 
     // The settings that specify the behavior for this Popup window.
     PopupContainerSettings m_settings;
 
-    // This is the index of the item marked as "selected" - i.e. displayed in the widget on the
-    // page.
+    // This is the index of the item marked as "selected" - i.e. displayed in
+    // the widget on the page.
     int m_originalIndex;
 
-    // This is the index of the item that the user is hovered over or has selected using the
-    // keyboard in the list. They have not confirmed this selection by clicking or pressing
-    // enter yet however.
+    // This is the index of the item that the user is hovered over or has
+    // selected using the keyboard in the list. They have not confirmed this
+    // selection by clicking or pressing enter yet however.
     int m_selectedIndex;
 
     // If >= 0, this is the index we should accept if the popup is "abandoned".
     // This is used for keyboard navigation, where we want the
     // selection to change immediately, and is only used if the settings
     // acceptOnAbandon field is true.
     int m_acceptedIndexOnAbandon;
 
-    // This is the number of rows visible in the popup. The maximum number visible at a time is
-    // defined as being kMaxVisibleRows. For a scrolled popup, this can be thought of as the
-    // page size in data units.
+    // This is the number of rows visible in the popup. The maximum number
+    // visible at a time is defined as being kMaxVisibleRows. For a scrolled
+    // popup, this can be thought of as the page size in data units.
     int m_visibleRows;
 
     // Our suggested width, not including scrollbar.
     int m_baseWidth;
 
     // The maximum height we can be without being off-screen.
     int m_maxHeight;
 
     // A list of the options contained within the <select>
     Vector<PopupItem*> m_items;
@@ skipping 15 matching lines @@
     UChar m_repeatingChar;
 
     // The last time the user hit a key. Used for typeAheadFind.
     TimeStamp m_lastCharTime;
 
     // If width exeeds screen width, we have to clip it.
     int m_maxWindowWidth;
 
     // To forward last mouse release event.
     RefPtr<Node> m_focusedNode;
-
 };
 
 } // namespace WebCore
 
 #endif