diff options
| -rw-r--r-- | chrome/browser/search_engines/template_url_fetcher.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc index 8b14aa3..164a70e 100644 --- a/chrome/browser/search_engines/template_url_fetcher.cc +++ b/chrome/browser/search_engines/template_url_fetcher.cc @@ -119,7 +119,6 @@ void TemplateURLFetcher::RequestDelegate::OnURLFetchComplete( template_url->set_safe_for_autoreplace(true); model->Add(template_url.release()); } else { -#if defined(OS_WIN) || !defined(TOOLKIT_VIEWS) // Confirm addition and allow user to edit default choices. It's ironic // that only *non*-autodetected additions get confirmed, but the user // expects feedback that his action did something. @@ -129,7 +128,6 @@ void TemplateURLFetcher::RequestDelegate::OnURLFetchComplete( template_url.release(), NULL, // no KeywordEditorView fetcher_->profile()); -#endif } } fetcher_->RequestCompleted(this); diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h index a52617a..40d6f69 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h @@ -9,12 +9,12 @@ #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/autocomplete/autocomplete_popup_view.h" +#include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" #include "views/view.h" #include "webkit/glue/window_open_disposition.h" class AutocompleteEditModel; class AutocompleteEditViewWin; -class AutocompletePopupWin; class Profile; // An interface implemented by an object that provides data to populate @@ -91,10 +91,8 @@ class AutocompletePopupContentsView : public views::View, // Makes the contents of the canvas slightly transparent. void MakeCanvasTransparent(gfx::Canvas* canvas); -#if defined(OS_WIN) // The popup that contains this view. scoped_ptr<AutocompletePopupWin> popup_; -#endif // The provider of our result set. scoped_ptr<AutocompletePopupModel> model_; |