diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-14 21:29:31 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-14 21:29:31 +0000 |
| commit | 46dd2f69b4df18364e8a5fc22a63a8e1ec3f5419 (patch) | |
| tree | 4f2d45c166e7006da1a160adb0743306e566c618 /chrome/browser/autocomplete | |
| parent | db60eefa06894eba873f2b323a6a7395bf8c81a0 (diff) | |
| download | chromium_src-46dd2f69b4df18364e8a5fc22a63a8e1ec3f5419.zip chromium_src-46dd2f69b4df18364e8a5fc22a63a8e1ec3f5419.tar.gz chromium_src-46dd2f69b4df18364e8a5fc22a63a8e1ec3f5419.tar.bz2 | |
Fix issue 30244
Ensure Alt is clear for our Ctrl+Shift/Shift+Ctrl logic so that Hebrew
IME generated Shift+Ctrl does not pass through and triggers RTL.
BUG=30244
TEST=Verify fix for 30244 and issue 24888 does not regress.
Review URL: http://codereview.chromium.org/497010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_win.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 6e570ea..75c9608 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -1320,8 +1320,9 @@ void AutocompleteEditViewWin::OnKeyUp(TCHAR key, // To work around this, if the user hits ctrl+shift, we pass it to // DefWindowProc() while the edit is empty, which toggles the default reading // order; then we restore the user's input. - if (((key == VK_CONTROL) && (GetKeyState(VK_SHIFT) < 0)) || - ((key == VK_SHIFT) && (GetKeyState(VK_CONTROL) < 0))) { + if ((GetKeyState(VK_MENU) == 0) && + (((key == VK_CONTROL) && (GetKeyState(VK_SHIFT) < 0)) || + ((key == VK_SHIFT) && (GetKeyState(VK_CONTROL) < 0)))) { ScopedFreeze freeze(this, GetTextObjectModel()); std::wstring saved_text(GetText()); |