diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 04:20:09 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 04:20:09 +0000 |
| commit | b2544aa9640c8e6c1716c88d61166303d089d6f1 (patch) | |
| tree | 29537171659266188cd71a478025ca9d63012d98 /chrome/browser/extensions/api/omnibox/omnibox_apitest.cc | |
| parent | f0aba3dffc38efc10d18c595611d52b6c718fbe9 (diff) | |
| download | chromium_src-b2544aa9640c8e6c1716c88d61166303d089d6f1.zip chromium_src-b2544aa9640c8e6c1716c88d61166303d089d6f1.tar.gz chromium_src-b2544aa9640c8e6c1716c88d61166303d089d6f1.tar.bz2 | |
browser: Move autocomplete_popup_model.* and autocomplete_popup_view.h into omnibox directory.
BUG=80186
R=pkasting@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/10574029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/omnibox/omnibox_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/api/omnibox/omnibox_apitest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_apitest.cc b/chrome/browser/extensions/api/omnibox/omnibox_apitest.cc index f136a4d..7c40242 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_apitest.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_apitest.cc @@ -9,7 +9,6 @@ #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_match.h" -#include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" @@ -18,12 +17,13 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/omnibox/location_bar.h" +#include "chrome/browser/ui/omnibox/omnibox_popup_model.h" #include "chrome/browser/ui/omnibox/omnibox_view.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/public/browser/notification_types.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/notification_types.h" #if defined(TOOLKIT_GTK) #include "chrome/browser/ui/gtk/browser_window_gtk.h" @@ -194,7 +194,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_PopupStaysClosed) { OmniboxView* omnibox_view = location_bar->GetLocationEntry(); AutocompleteController* autocomplete_controller = GetAutocompleteController(browser()); - AutocompletePopupModel* popup_model = omnibox_view->model()->popup_model(); + OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model(); // Input a keyword query and wait for suggestions from the extension. omnibox_view->OnBeforePossibleChange(); |