summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-01 20:54:12 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-01 20:54:12 +0000
commit8321a3750c190dc9eeaf75d1bfff9269e8b1846c (patch)
tree5f0fb309bc8ff61bafba20d39c5b69cca4105e36
parentab14010275006fba363ec36dd9c5e3e72954c1b2 (diff)
downloadchromium_src-8321a3750c190dc9eeaf75d1bfff9269e8b1846c.zip
chromium_src-8321a3750c190dc9eeaf75d1bfff9269e8b1846c.tar.gz
chromium_src-8321a3750c190dc9eeaf75d1bfff9269e8b1846c.tar.bz2
Remove StopAutocomplete() helper from AutocompletePopupViewMac.
When the code was originally written, GetModel() was not required by AutocompletePopupView, now it's easy enough to use that instead. Review URL: http://codereview.chromium.org/99278 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15094 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_mac.mm3
-rw-r--r--chrome/browser/autocomplete/autocomplete_popup_view_mac.h1
-rw-r--r--chrome/browser/autocomplete/autocomplete_popup_view_mac.mm4
3 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index 40e212b..c9ca5fc 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -6,6 +6,7 @@
#include "base/sys_string_conversions.h"
#include "chrome/browser/autocomplete/autocomplete_edit.h"
+#include "chrome/browser/autocomplete/autocomplete_popup_model.h"
#include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
// Thin Obj-C bridge class that is the delegate of the omnibox field.
@@ -137,7 +138,7 @@ void AutocompleteEditViewMac::UpdatePopup() {
}
void AutocompleteEditViewMac::ClosePopup() {
- popup_view_->StopAutocomplete();
+ popup_view_->GetModel()->StopAutocomplete();
}
void AutocompleteEditViewMac::UpdateAndStyleText(
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h
index 4a69413..6639c0f 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h
@@ -67,7 +67,6 @@ class AutocompletePopupViewMac : public AutocompletePopupView {
// Helpers which forward to model_, otherwise our Objective-C helper
// object would need model_ to be public:.
- void StopAutocomplete();
size_t ResultRowCount();
const std::wstring& ResultContentsAt(size_t i);
bool ResultStarredAt(size_t i);
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
index 3d9a6d4..8ec24e0 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
@@ -169,10 +169,6 @@ AutocompletePopupModel* AutocompletePopupViewMac::GetModel() {
return model_.get();
}
-void AutocompletePopupViewMac::StopAutocomplete() {
- model_->StopAutocomplete();
-}
-
size_t AutocompletePopupViewMac::ResultRowCount() {
return model_->result().size();
}