summaryrefslogtreecommitdiffstats
path: root/chrome/browser/omnibox_search_hint.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 22:17:11 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 22:17:11 +0000
commitb76ac717179aa1e2c4425783a2386b7fb4b9535c (patch)
tree74ed8bb871877927767deef1fcd4b615aedb6978 /chrome/browser/omnibox_search_hint.cc
parent38ba5bd7a0c7770e95aea6619174a953e5d92796 (diff)
downloadchromium_src-b76ac717179aa1e2c4425783a2386b7fb4b9535c.zip
chromium_src-b76ac717179aa1e2c4425783a2386b7fb4b9535c.tar.gz
chromium_src-b76ac717179aa1e2c4425783a2386b7fb4b9535c.tar.bz2
autocomplete: Move AutocompleteEditView/autocomplete_edit_view.* to ui/omnibox directory.
- Rename AutocompleteEditView to OmniboxView. - Move autocomplete_edit_view.* to omnibox_view.* BUG=80186 TEST=None R=pkasting@chromium.org Review URL: http://codereview.chromium.org/6912026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/omnibox_search_hint.cc')
-rw-r--r--chrome/browser/omnibox_search_hint.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc
index 27c2ea6..9053dd8 100644
--- a/chrome/browser/omnibox_search_hint.cc
+++ b/chrome/browser/omnibox_search_hint.cc
@@ -11,7 +11,6 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/autocomplete/autocomplete.h"
#include "chrome/browser/autocomplete/autocomplete_edit.h"
-#include "chrome/browser/autocomplete/autocomplete_edit_view.h"
#include "chrome/browser/autocomplete/autocomplete_match.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -21,6 +20,7 @@
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/omnibox/location_bar.h"
+#include "chrome/browser/ui/omnibox/omnibox_view.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "content/browser/tab_contents/tab_contents.h"
@@ -208,14 +208,14 @@ void OmniboxSearchHint::ShowInfoBar() {
void OmniboxSearchHint::ShowEnteringQuery() {
LocationBar* location_bar = BrowserList::GetLastActive()->window()->
GetLocationBar();
- AutocompleteEditView* edit_view = location_bar->location_entry();
+ OmniboxView* omnibox_view = location_bar->location_entry();
location_bar->FocusLocation(true);
- edit_view->SetUserText(
+ omnibox_view->SetUserText(
l10n_util::GetStringUTF16(IDS_OMNIBOX_SEARCH_HINT_OMNIBOX_TEXT));
- edit_view->SelectAll(false);
- // Entering text in the autocomplete edit view triggers the suggestion popup
- // that we don't want to show in this case.
- edit_view->ClosePopup();
+ omnibox_view->SelectAll(false);
+ // Entering text in the omnibox view triggers the suggestion popup that we
+ // don't want to show in this case.
+ omnibox_view->ClosePopup();
}
void OmniboxSearchHint::DisableHint() {