| 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/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 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 if (show_keyword_hint_) | 529 if (show_keyword_hint_) |
| 530 SetKeywordHintLabel(keyword); | 530 SetKeywordHintLabel(keyword); |
| 531 | 531 |
| 532 AdjustChildrenVisibility(); | 532 AdjustChildrenVisibility(); |
| 533 | 533 |
| 534 InstantController* instant = browser_->instant(); | 534 InstantController* instant = browser_->instant(); |
| 535 string16 suggested_text; | 535 string16 suggested_text; |
| 536 if (update_instant_ && instant && GetTabContents()) { | 536 if (update_instant_ && instant && GetTabContents()) { |
| 537 if (location_entry_->model()->user_input_in_progress() && | 537 if (location_entry_->model()->user_input_in_progress() && |
| 538 location_entry_->model()->popup_model()->IsOpen()) { | 538 location_entry_->model()->popup_model()->IsOpen()) { |
| 539 instant->Update(GetTabContents(), | 539 instant->Update(browser_->GetSelectedTabContentsWrapper(), |
| 540 location_entry_->model()->CurrentMatch(), | 540 location_entry_->model()->CurrentMatch(), |
| 541 WideToUTF16(location_entry_->GetText()), | 541 WideToUTF16(location_entry_->GetText()), |
| 542 &suggested_text); | 542 &suggested_text); |
| 543 } else { | 543 } else { |
| 544 instant->DestroyPreviewContents(); | 544 instant->DestroyPreviewContents(); |
| 545 } | 545 } |
| 546 } | 546 } |
| 547 | 547 |
| 548 SetSuggestedText(suggested_text); | 548 SetSuggestedText(suggested_text); |
| 549 } | 549 } |
| (...skipping 970 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1520 | 1520 |
| 1521 std::string badge_text = page_action_->GetBadgeText(tab_id); | 1521 std::string badge_text = page_action_->GetBadgeText(tab_id); |
| 1522 if (badge_text.empty()) | 1522 if (badge_text.empty()) |
| 1523 return FALSE; | 1523 return FALSE; |
| 1524 | 1524 |
| 1525 gfx::CanvasSkiaPaint canvas(event, false); | 1525 gfx::CanvasSkiaPaint canvas(event, false); |
| 1526 gfx::Rect bounding_rect(widget->allocation); | 1526 gfx::Rect bounding_rect(widget->allocation); |
| 1527 page_action_->PaintBadge(&canvas, bounding_rect, tab_id); | 1527 page_action_->PaintBadge(&canvas, bounding_rect, tab_id); |
| 1528 return FALSE; | 1528 return FALSE; |
| 1529 } | 1529 } |
| OLD | NEW |