diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 16:32:59 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 16:32:59 +0000 |
| commit | 88efb7ec99239eeecaa17d21f8635be1bce29cca (patch) | |
| tree | b1a988fbca10748e584f78abb755036e63ff335f /webkit/api | |
| parent | c9d6a1df8ef5fd2c3f134dcb544663ce8bd21c7b (diff) | |
| download | chromium_src-88efb7ec99239eeecaa17d21f8635be1bce29cca.zip chromium_src-88efb7ec99239eeecaa17d21f8635be1bce29cca.tar.gz chromium_src-88efb7ec99239eeecaa17d21f8635be1bce29cca.tar.bz2 | |
Replace ShowAsPopupWithItems to CreatePopupWidgetWithInfo. Also,
make use of WebPopupMenuInfo from the WebKit API. WebMenuItem
remains in webkit/glue for convenience with IPC marshalling and
related usage in Chrome.
This work is precursor to switching over to using WebWidget from
the WebKit API.
BUG=16234
TEST=html select drop downs should still work on the mac. try
switching languages on news.google.com.
R=paul
Review URL: http://codereview.chromium.org/155378
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/api')
| -rw-r--r-- | webkit/api/public/WebPopupMenuInfo.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/api/public/WebPopupMenuInfo.h b/webkit/api/public/WebPopupMenuInfo.h index 5ce741b..b976dd0 100644 --- a/webkit/api/public/WebPopupMenuInfo.h +++ b/webkit/api/public/WebPopupMenuInfo.h @@ -1,10 +1,10 @@ /* * 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 @@ -14,7 +14,7 @@ * * 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 @@ -31,10 +31,9 @@ #ifndef WebPopupMenuInfo_h #define WebPopupMenuInfo_h -#error "This header file is still a work in progress; do not include!" - #include "WebCommon.h" #include "WebRect.h" +#include "WebString.h" #include "WebVector.h" namespace WebKit { @@ -52,10 +51,11 @@ namespace WebKit { bool enabled; }; - WebRect bounds; int itemHeight; int selectedIndex; WebVector<Item> items; }; } // namespace WebKit + +#endif |