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/gtk/location_bar_view_gtk.h" | 5 #include "chrome/browser/gtk/location_bar_view_gtk.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
460 | 460 |
461 bool LocationBarViewGtk::OnCommitSuggestedText( | 461 bool LocationBarViewGtk::OnCommitSuggestedText( |
462 const std::wstring& typed_text) { | 462 const std::wstring& typed_text) { |
463 return browser_->instant() && location_entry_->CommitInstantSuggestion(); | 463 return browser_->instant() && location_entry_->CommitInstantSuggestion(); |
464 } | 464 } |
465 | 465 |
466 bool LocationBarViewGtk::AcceptCurrentInstantPreview() { | 466 bool LocationBarViewGtk::AcceptCurrentInstantPreview() { |
467 return InstantController::CommitIfCurrent(browser_->instant()); | 467 return InstantController::CommitIfCurrent(browser_->instant()); |
468 } | 468 } |
469 | 469 |
470 void LocationBarViewGtk::OnSetSuggestedSearchText( | |
471 const string16& suggested_text) { | |
472 SetSuggestedText(suggested_text); | |
473 } | |
474 | |
475 void LocationBarViewGtk::OnPopupBoundsChanged(const gfx::Rect& bounds) { | 470 void LocationBarViewGtk::OnPopupBoundsChanged(const gfx::Rect& bounds) { |
476 InstantController* instant = browser_->instant(); | 471 InstantController* instant = browser_->instant(); |
477 if (instant) | 472 if (instant) |
478 instant->SetOmniboxBounds(bounds); | 473 instant->SetOmniboxBounds(bounds); |
479 } | 474 } |
480 | 475 |
481 void LocationBarViewGtk::OnAutocompleteAccept(const GURL& url, | 476 void LocationBarViewGtk::OnAutocompleteAccept(const GURL& url, |
482 WindowOpenDisposition disposition, | 477 WindowOpenDisposition disposition, |
483 PageTransition::Type transition, | 478 PageTransition::Type transition, |
484 const GURL& alternate_nav_url) { | 479 const GURL& alternate_nav_url) { |
(...skipping 1066 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1551 | 1546 |
1552 std::string badge_text = page_action_->GetBadgeText(tab_id); | 1547 std::string badge_text = page_action_->GetBadgeText(tab_id); |
1553 if (badge_text.empty()) | 1548 if (badge_text.empty()) |
1554 return FALSE; | 1549 return FALSE; |
1555 | 1550 |
1556 gfx::CanvasSkiaPaint canvas(event, false); | 1551 gfx::CanvasSkiaPaint canvas(event, false); |
1557 gfx::Rect bounding_rect(widget->allocation); | 1552 gfx::Rect bounding_rect(widget->allocation); |
1558 page_action_->PaintBadge(&canvas, bounding_rect, tab_id); | 1553 page_action_->PaintBadge(&canvas, bounding_rect, tab_id); |
1559 return FALSE; | 1554 return FALSE; |
1560 } | 1555 } |
OLD | NEW |