| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.
h" | 5 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.
h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <commctrl.h> | 8 #include <commctrl.h> |
| 9 #include <dwmapi.h> | 9 #include <dwmapi.h> |
| 10 #include <objidl.h> | 10 #include <objidl.h> |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 omnibox_view_(omnibox_view), | 219 omnibox_view_(omnibox_view), |
| 220 profile_(edit_model->profile()), | 220 profile_(edit_model->profile()), |
| 221 location_bar_(location_bar), | 221 location_bar_(location_bar), |
| 222 result_font_(font.DeriveFont(kEditFontAdjust)), | 222 result_font_(font.DeriveFont(kEditFontAdjust)), |
| 223 result_bold_font_(result_font_.DeriveFont(0, gfx::Font::BOLD)), | 223 result_bold_font_(result_font_.DeriveFont(0, gfx::Font::BOLD)), |
| 224 ignore_mouse_drag_(false), | 224 ignore_mouse_drag_(false), |
| 225 ALLOW_THIS_IN_INITIALIZER_LIST(size_animation_(this)) { | 225 ALLOW_THIS_IN_INITIALIZER_LIST(size_animation_(this)) { |
| 226 // The following little dance is required because set_border() requires a | 226 // The following little dance is required because set_border() requires a |
| 227 // pointer to a non-const object. | 227 // pointer to a non-const object. |
| 228 views::BubbleBorder* bubble_border = | 228 views::BubbleBorder* bubble_border = |
| 229 new views::BubbleBorder(views::BubbleBorder::NONE); | 229 new views::BubbleBorder(views::BubbleBorder::NONE, |
| 230 views::BubbleBorder::NO_SHADOW); |
| 230 bubble_border_ = bubble_border; | 231 bubble_border_ = bubble_border; |
| 231 set_border(bubble_border); | 232 set_border(bubble_border); |
| 232 // The contents is owned by the LocationBarView. | 233 // The contents is owned by the LocationBarView. |
| 233 set_parent_owned(false); | 234 set_parent_owned(false); |
| 234 } | 235 } |
| 235 | 236 |
| 236 AutocompletePopupContentsView::~AutocompletePopupContentsView() { | 237 AutocompletePopupContentsView::~AutocompletePopupContentsView() { |
| 237 // We don't need to do anything with |popup_| here. The OS either has already | 238 // We don't need to do anything with |popup_| here. The OS either has already |
| 238 // closed the window, in which case it's been deleted, or it will soon, in | 239 // closed the window, in which case it's been deleted, or it will soon, in |
| 239 // which case there's nothing we need to do. | 240 // which case there's nothing we need to do. |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 687 opt_in_view_ = NULL; | 688 opt_in_view_ = NULL; |
| 688 PromoCounter* counter = profile_->GetInstantPromoCounter(); | 689 PromoCounter* counter = profile_->GetInstantPromoCounter(); |
| 689 DCHECK(counter); | 690 DCHECK(counter); |
| 690 counter->Hide(); | 691 counter->Hide(); |
| 691 if (opt_in) { | 692 if (opt_in) { |
| 692 browser::ShowInstantConfirmDialogIfNecessary( | 693 browser::ShowInstantConfirmDialogIfNecessary( |
| 693 location_bar_->GetWidget()->GetNativeWindow(), profile_); | 694 location_bar_->GetWidget()->GetNativeWindow(), profile_); |
| 694 } | 695 } |
| 695 UpdatePopupAppearance(); | 696 UpdatePopupAppearance(); |
| 696 } | 697 } |
| OLD | NEW |