Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(528)

Side by Side Diff: Source/web/PopupListBox.h

Issue 652693002: Replace FINAL and OVERRIDE with their C++11 counterparts in WebKit/Source (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Corrected the Patch Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/web/PopupContainer.h ('k') | Source/web/PopupMenuChromium.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011, Google Inc. All rights reserved. 2 * Copyright (c) 2011, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 virtual void setMaxWidthAndLayout(int) override; 174 virtual void setMaxWidthAndLayout(int) override;
175 175
176 void disconnectClient() { m_popupClient = 0; } 176 void disconnectClient() { m_popupClient = 0; }
177 177
178 const Vector<PopupItem*>& items() const { return m_items; } 178 const Vector<PopupItem*>& items() const { return m_items; }
179 179
180 virtual int popupContentHeight() const override; 180 virtual int popupContentHeight() const override;
181 181
182 static const int defaultMaxHeight; 182 static const int defaultMaxHeight;
183 183
184 void trace(Visitor*) OVERRIDE; 184 void trace(Visitor*) override;
185 185
186 protected: 186 protected:
187 virtual void invalidateScrollCornerRect(const IntRect&) override { } 187 virtual void invalidateScrollCornerRect(const IntRect&) override { }
188 188
189 private: 189 private:
190 friend class PopupContainer; 190 friend class PopupContainer;
191 friend class RefCounted<PopupListBox>; 191 friend class RefCounted<PopupListBox>;
192 192
193 PopupListBox(PopupMenuClient*, bool deviceSupportsTouch, PopupContainer*); 193 PopupListBox(PopupMenuClient*, bool deviceSupportsTouch, PopupContainer*);
194 virtual ~PopupListBox(); 194 virtual ~PopupListBox();
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 RawPtrWillBeMember<PopupContainer> m_container; 316 RawPtrWillBeMember<PopupContainer> m_container;
317 317
318 RefPtrWillBeMember<Scrollbar> m_verticalScrollbar; 318 RefPtrWillBeMember<Scrollbar> m_verticalScrollbar;
319 IntSize m_contentsSize; 319 IntSize m_contentsSize;
320 IntPoint m_scrollOffset; 320 IntPoint m_scrollOffset;
321 }; 321 };
322 322
323 } // namespace blink 323 } // namespace blink
324 324
325 #endif 325 #endif
OLDNEW
« no previous file with comments | « Source/web/PopupContainer.h ('k') | Source/web/PopupMenuChromium.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698