| 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/location_bar/location_bar_view.h" | 5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 6 | 6 |
| 7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 return false; | 778 return false; |
| 779 suggestion = suggested_text_view_->GetText(); | 779 suggestion = suggested_text_view_->GetText(); |
| 780 #endif | 780 #endif |
| 781 return location_entry_->CommitInstantSuggestion(typed_text, suggestion); | 781 return location_entry_->CommitInstantSuggestion(typed_text, suggestion); |
| 782 } | 782 } |
| 783 | 783 |
| 784 bool LocationBarView::AcceptCurrentInstantPreview() { | 784 bool LocationBarView::AcceptCurrentInstantPreview() { |
| 785 return InstantController::CommitIfCurrent(delegate_->GetInstant()); | 785 return InstantController::CommitIfCurrent(delegate_->GetInstant()); |
| 786 } | 786 } |
| 787 | 787 |
| 788 void LocationBarView::OnSetSuggestedSearchText(const string16& suggested_text) { | |
| 789 SetSuggestedText(suggested_text); | |
| 790 } | |
| 791 | |
| 792 void LocationBarView::OnPopupBoundsChanged(const gfx::Rect& bounds) { | 788 void LocationBarView::OnPopupBoundsChanged(const gfx::Rect& bounds) { |
| 793 InstantController* instant = delegate_->GetInstant(); | 789 InstantController* instant = delegate_->GetInstant(); |
| 794 if (instant) | 790 if (instant) |
| 795 instant->SetOmniboxBounds(bounds); | 791 instant->SetOmniboxBounds(bounds); |
| 796 } | 792 } |
| 797 | 793 |
| 798 void LocationBarView::OnAutocompleteAccept( | 794 void LocationBarView::OnAutocompleteAccept( |
| 799 const GURL& url, | 795 const GURL& url, |
| 800 WindowOpenDisposition disposition, | 796 WindowOpenDisposition disposition, |
| 801 PageTransition::Type transition, | 797 PageTransition::Type transition, |
| (...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1259 template_url_model_ = NULL; | 1255 template_url_model_ = NULL; |
| 1260 ShowFirstRunBubble(bubble_type_); | 1256 ShowFirstRunBubble(bubble_type_); |
| 1261 } | 1257 } |
| 1262 | 1258 |
| 1263 #if defined(OS_WIN) | 1259 #if defined(OS_WIN) |
| 1264 bool LocationBarView::HasValidSuggestText() { | 1260 bool LocationBarView::HasValidSuggestText() { |
| 1265 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() && | 1261 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() && |
| 1266 !suggested_text_view_->GetText().empty(); | 1262 !suggested_text_view_->GetText().empty(); |
| 1267 } | 1263 } |
| 1268 #endif | 1264 #endif |
| OLD | NEW |