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

Side by Side Diff: Source/WebCore/platform/chromium/PopupMenuChromium.h

Issue 11099038: Merge 130513 - [chromium] Only inflate the height of rows in a popup menu when a touch device is de… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. 2 * Copyright (c) 2008, 2009, 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 PopupMenuChromium(PopupMenuClient*); 49 PopupMenuChromium(PopupMenuClient*);
50 ~PopupMenuChromium(); 50 ~PopupMenuChromium();
51 51
52 virtual void show(const IntRect&, FrameView*, int index); 52 virtual void show(const IntRect&, FrameView*, int index);
53 virtual void hide(); 53 virtual void hide();
54 virtual void updateFromElement(); 54 virtual void updateFromElement();
55 virtual void disconnectClient(); 55 virtual void disconnectClient();
56 56
57 static int minimumRowHeight() { return s_minimumRowHeight; } 57 static int minimumRowHeight() { return s_minimumRowHeight; }
58 static void setMinimumRowHeight(int minimumRowHeight) { s_minimumRowHeight = minimumRowHeight; } 58 static void setMinimumRowHeight(int minimumRowHeight) { s_minimumRowHeight = minimumRowHeight; }
59 static int optionRowHeightForTouch() { return s_optionRowHeightForTouch; }
60 static void setOptionRowHeightForTouch(int optionRowHeightForTouch) { s_opti onRowHeightForTouch = optionRowHeightForTouch; }
59 61
60 private: 62 private:
61 PopupMenuClient* client() const { return m_popupClient; } 63 PopupMenuClient* client() const { return m_popupClient; }
62 64
63 PopupMenuClient* m_popupClient; 65 PopupMenuClient* m_popupClient;
64 PopupMenuPrivate p; 66 PopupMenuPrivate p;
65 67
66 static int s_minimumRowHeight; 68 static int s_minimumRowHeight;
69 static int s_optionRowHeightForTouch;
67 }; 70 };
68 71
69 } // namespace WebCore 72 } // namespace WebCore
70 73
71 #endif 74 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/platform/chromium/PopupListBox.cpp ('k') | Source/WebCore/platform/chromium/PopupMenuChromium.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698