| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/views/location_bar/location_bar_view.h" | 5 #include "chrome/browser/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 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 838 // that it shouldn't to stick in a NOTREACHED(). In any case, this is | 838 // that it shouldn't to stick in a NOTREACHED(). In any case, this is |
| 839 // harmless. | 839 // harmless. |
| 840 delete fetcher; | 840 delete fetcher; |
| 841 } else { | 841 } else { |
| 842 // The navigation controller will delete the fetcher. | 842 // The navigation controller will delete the fetcher. |
| 843 } | 843 } |
| 844 } | 844 } |
| 845 } | 845 } |
| 846 } | 846 } |
| 847 | 847 |
| 848 if (delegate_->GetInstant()) | 848 if (delegate_->GetInstant() && |
| 849 !location_entry_->model()->popup_model()->IsOpen()) { |
| 849 delegate_->GetInstant()->DestroyPreviewContents(); | 850 delegate_->GetInstant()->DestroyPreviewContents(); |
| 851 } |
| 850 | 852 |
| 851 update_instant_ = true; | 853 update_instant_ = true; |
| 852 } | 854 } |
| 853 | 855 |
| 854 void LocationBarView::OnChanged() { | 856 void LocationBarView::OnChanged() { |
| 855 location_icon_view_->SetImage( | 857 location_icon_view_->SetImage( |
| 856 ResourceBundle::GetSharedInstance().GetBitmapNamed( | 858 ResourceBundle::GetSharedInstance().GetBitmapNamed( |
| 857 location_entry_->GetIcon())); | 859 location_entry_->GetIcon())); |
| 858 Layout(); | 860 Layout(); |
| 859 SchedulePaint(); | 861 SchedulePaint(); |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1262 template_url_model_ = NULL; | 1264 template_url_model_ = NULL; |
| 1263 ShowFirstRunBubble(bubble_type_); | 1265 ShowFirstRunBubble(bubble_type_); |
| 1264 } | 1266 } |
| 1265 | 1267 |
| 1266 #if defined(OS_WIN) | 1268 #if defined(OS_WIN) |
| 1267 bool LocationBarView::HasValidSuggestText() { | 1269 bool LocationBarView::HasValidSuggestText() { |
| 1268 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() && | 1270 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() && |
| 1269 !suggested_text_view_->GetText().empty(); | 1271 !suggested_text_view_->GetText().empty(); |
| 1270 } | 1272 } |
| 1271 #endif | 1273 #endif |
| OLD | NEW |