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

Side by Side Diff: chrome/browser/gtk/location_bar_view_gtk.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: Nuke IsPopupOpen. 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
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/gtk/location_bar_view_gtk.h" 5 #include "chrome/browser/gtk/location_bar_view_gtk.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/gtk_dnd_util.h" 9 #include "app/gtk_dnd_util.h"
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 // that it shouldn't to stick in a NOTREACHED(). In any case, this is 502 // that it shouldn't to stick in a NOTREACHED(). In any case, this is
503 // harmless. 503 // harmless.
504 delete fetcher; 504 delete fetcher;
505 } else { 505 } else {
506 // The navigation controller will delete the fetcher. 506 // The navigation controller will delete the fetcher.
507 } 507 }
508 } 508 }
509 } 509 }
510 } 510 }
511 511
512 if (browser_->instant()) 512 if (browser_->instant() && !location_entry_->model()->popup_model()->IsOpen())
513 browser_->instant()->DestroyPreviewContents(); 513 browser_->instant()->DestroyPreviewContents();
514 514
515 update_instant_ = true; 515 update_instant_ = true;
516 } 516 }
517 517
518 void LocationBarViewGtk::OnChanged() { 518 void LocationBarViewGtk::OnChanged() {
519 UpdateSiteTypeArea(); 519 UpdateSiteTypeArea();
520 520
521 const std::wstring keyword(location_entry_->model()->keyword()); 521 const std::wstring keyword(location_entry_->model()->keyword());
522 const bool is_keyword_hint = location_entry_->model()->is_keyword_hint(); 522 const bool is_keyword_hint = location_entry_->model()->is_keyword_hint();
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 1537
1538 std::string badge_text = page_action_->GetBadgeText(tab_id); 1538 std::string badge_text = page_action_->GetBadgeText(tab_id);
1539 if (badge_text.empty()) 1539 if (badge_text.empty())
1540 return FALSE; 1540 return FALSE;
1541 1541
1542 gfx::CanvasSkiaPaint canvas(event, false); 1542 gfx::CanvasSkiaPaint canvas(event, false);
1543 gfx::Rect bounding_rect(widget->allocation); 1543 gfx::Rect bounding_rect(widget->allocation);
1544 page_action_->PaintBadge(&canvas, bounding_rect, tab_id); 1544 page_action_->PaintBadge(&canvas, bounding_rect, tab_id);
1545 return FALSE; 1545 return FALSE;
1546 } 1546 }
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698