summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-07 15:08:11 +0000
committeraruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-07 15:08:11 +0000
commit91d4f2541624923604d54fdf280483a08a393464 (patch)
treee5c9fcb2c85f549baf148dc5e61ca233bc33cf65
parentd1bd743c1d26635bf39f89e40c08edbf74edd991 (diff)
downloadchromium_src-91d4f2541624923604d54fdf280483a08a393464.zip
chromium_src-91d4f2541624923604d54fdf280483a08a393464.tar.gz
chromium_src-91d4f2541624923604d54fdf280483a08a393464.tar.bz2
Fix for html select state not restored when app brought to foreground from background.
BUG=139760 TEST=As described in the bug. When power button or home key is pressed, ChromeView's onActivityPause dismisses the SelectPopupDialog. But this is not known to native code. Next time user clicks a select box, renderer(RenderViewImpl::createExternalPopupMenu) assumes the previously created external_popup_menu_ is still visible and doesn't show it again. Fix is to let the native code know that the popup menu is dismissed. Original CL: https://chromiumcodereview.appspot.com/10837075/ Review URL: https://chromiumcodereview.appspot.com/11365008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166424 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/public/android/java/src/org/chromium/content/browser/SelectPopupDialog.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/SelectPopupDialog.java b/content/public/android/java/src/org/chromium/content/browser/SelectPopupDialog.java
index 3556755..b5d00a5 100644
--- a/content/public/android/java/src/org/chromium/content/browser/SelectPopupDialog.java
+++ b/content/public/android/java/src/org/chromium/content/browser/SelectPopupDialog.java
@@ -205,6 +205,7 @@ class SelectPopupDialog {
public static void hide(ContentViewCore contentView) {
if (sShownDialog != null &&
(contentView == null || sShownDialog.mContentViewCore == contentView)) {
+ if (contentView != null) contentView.selectPopupMenuItems(null);
sShownDialog.mListBoxPopup.dismiss();
}
}