summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-23 19:09:37 +0000
committerrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-23 19:09:37 +0000
commit722ec18ab0d520ff1b029bb961a92618c39f9f2d (patch)
tree3e6ca2ec1bbde087a0e9dffcfdad1e45e9cfaf0e /chrome/browser/cocoa
parentf02ea3bb8172bde0d154b51782876eb12d4a03c9 (diff)
downloadchromium_src-722ec18ab0d520ff1b029bb961a92618c39f9f2d.zip
chromium_src-722ec18ab0d520ff1b029bb961a92618c39f9f2d.tar.gz
chromium_src-722ec18ab0d520ff1b029bb961a92618c39f9f2d.tar.bz2
[Mac] Fixes a bug where instant suggest text would disappear on every other keystroke.
Implements DeleteAtEndPressed(), which is needed for verbatim instant support. BUG=56385,59217,64212 TEST=Open chrome with instant enabled. Type "nswi" into omnibox. Should suggest "nswindow." Now type "n." Should continue to suggest "nswindow." TEST=Open chrome with instant enabled. Type "nswind" into omnibox. Should suggest "nswindow." Delete one character. Should not suggest "nswindow." Review URL: http://codereview.chromium.org/5288003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/location_bar/location_bar_view_mac.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm
index c897465..e4b2ce1 100644
--- a/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm
@@ -141,7 +141,8 @@ std::wstring LocationBarViewMac::GetInputString() const {
}
void LocationBarViewMac::SetSuggestedText(const string16& text) {
- edit_view_->SetSuggestText(text);
+ edit_view_->SetSuggestText(
+ edit_view_->model()->UseVerbatimInstant() ? string16() : text);
}
WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const {