Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 6028010: Fixes bug in handling of openning background tabs by way of clicking (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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() && !location_entry_->model()->IsPopupOpen())
849 delegate_->GetInstant()->DestroyPreviewContents(); 849 delegate_->GetInstant()->DestroyPreviewContents();
850 850
851 update_instant_ = true; 851 update_instant_ = true;
852 } 852 }
853 853
854 void LocationBarView::OnChanged() { 854 void LocationBarView::OnChanged() {
855 location_icon_view_->SetImage( 855 location_icon_view_->SetImage(
856 ResourceBundle::GetSharedInstance().GetBitmapNamed( 856 ResourceBundle::GetSharedInstance().GetBitmapNamed(
857 location_entry_->GetIcon())); 857 location_entry_->GetIcon()));
858 Layout(); 858 Layout();
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 template_url_model_ = NULL; 1262 template_url_model_ = NULL;
1263 ShowFirstRunBubble(bubble_type_); 1263 ShowFirstRunBubble(bubble_type_);
1264 } 1264 }
1265 1265
1266 #if defined(OS_WIN) 1266 #if defined(OS_WIN)
1267 bool LocationBarView::HasValidSuggestText() { 1267 bool LocationBarView::HasValidSuggestText() {
1268 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() && 1268 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
1269 !suggested_text_view_->GetText().empty(); 1269 !suggested_text_view_->GetText().empty();
1270 } 1270 }
1271 #endif 1271 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698