summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/omnibox
diff options
context:
space:
mode:
authorjdonnelly@chromium.org <jdonnelly@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 04:23:59 +0000
committerjdonnelly@chromium.org <jdonnelly@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 04:23:59 +0000
commitbe80fbd7e10d43f97973533b5a11983e8df1d268 (patch)
tree69406d203c85ed61a80f3c3cf93a9a63204cd22f /chrome/browser/ui/omnibox
parentb47fae35e05cf17fa57ac58cd596820f873ccd21 (diff)
downloadchromium_src-be80fbd7e10d43f97973533b5a11983e8df1d268.zip
chromium_src-be80fbd7e10d43f97973533b5a11983e8df1d268.tar.gz
chromium_src-be80fbd7e10d43f97973533b5a11983e8df1d268.tar.bz2
Eliminate the OmniboxEditModel::GetViewText() method.
The method is only used one place, which is a somewhat unnecessary call in the same class. BUG= Review URL: https://codereview.chromium.org/89273002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/omnibox')
-rw-r--r--chrome/browser/ui/omnibox/omnibox_edit_model.cc6
-rw-r--r--chrome/browser/ui/omnibox/omnibox_edit_model.h3
2 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
index eed2952..550e718 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
@@ -763,7 +763,7 @@ void OmniboxEditModel::OpenMatch(AutocompleteMatch match,
}
// Get the current text before we call RevertAll() which will clear it.
- string16 current_text = GetViewText();
+ string16 current_text = view_->GetText();
if (disposition != NEW_BACKGROUND_TAB) {
base::AutoReset<bool> tmp(&in_revert_, true);
@@ -1212,10 +1212,6 @@ void OmniboxEditModel::OnCurrentMatchChanged() {
OnPopupDataChanged(inline_autocompletion, NULL, keyword, is_keyword_hint);
}
-string16 OmniboxEditModel::GetViewText() const {
- return view_->GetText();
-}
-
InstantController* OmniboxEditModel::GetInstantController() const {
return controller_->GetInstant();
}
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h
index 054fd9f..2ed122c 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.h
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h
@@ -319,9 +319,6 @@ class OmniboxEditModel {
// Called when the current match has changed in the OmniboxController.
void OnCurrentMatchChanged();
- // Access the current view text.
- string16 GetViewText() const;
-
// TODO(beaudoin): We need this to allow OmniboxController access the
// InstantController via OmniboxEditController, because the only valid pointer
// to InstantController is kept in Browser. We should try to get rid of this,