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/ui/gtk/location_bar_view_gtk.h" | 5 #include "chrome/browser/ui/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 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
544 | 544 |
545 toolbar_model_->set_input_in_progress(in_progress); | 545 toolbar_model_->set_input_in_progress(in_progress); |
546 Update(NULL); | 546 Update(NULL); |
547 } | 547 } |
548 | 548 |
549 void LocationBarViewGtk::OnKillFocus() { | 549 void LocationBarViewGtk::OnKillFocus() { |
550 } | 550 } |
551 | 551 |
552 void LocationBarViewGtk::OnSetFocus() { | 552 void LocationBarViewGtk::OnSetFocus() { |
553 Profile* profile = browser_->profile(); | 553 Profile* profile = browser_->profile(); |
554 AccessibilityTextBoxInfo info(profile, | 554 AccessibilityTextBoxInfo info( |
555 l10n_util::GetStringUTF8(IDS_ACCNAME_LOCATION), false); | 555 profile, |
| 556 l10n_util::GetStringUTF8(IDS_ACCNAME_LOCATION), |
| 557 std::string(), |
| 558 false); |
556 content::NotificationService::current()->Notify( | 559 content::NotificationService::current()->Notify( |
557 chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED, | 560 chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED, |
558 content::Source<Profile>(profile), | 561 content::Source<Profile>(profile), |
559 content::Details<AccessibilityTextBoxInfo>(&info)); | 562 content::Details<AccessibilityTextBoxInfo>(&info)); |
560 | 563 |
561 // Update the keyword and search hint states. | 564 // Update the keyword and search hint states. |
562 OnChanged(); | 565 OnChanged(); |
563 } | 566 } |
564 | 567 |
565 SkBitmap LocationBarViewGtk::GetFavicon() const { | 568 SkBitmap LocationBarViewGtk::GetFavicon() const { |
(...skipping 1079 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1645 | 1648 |
1646 std::string badge_text = page_action_->GetBadgeText(tab_id); | 1649 std::string badge_text = page_action_->GetBadgeText(tab_id); |
1647 if (badge_text.empty()) | 1650 if (badge_text.empty()) |
1648 return FALSE; | 1651 return FALSE; |
1649 | 1652 |
1650 gfx::CanvasSkiaPaint canvas(event, false); | 1653 gfx::CanvasSkiaPaint canvas(event, false); |
1651 gfx::Rect bounding_rect(widget->allocation); | 1654 gfx::Rect bounding_rect(widget->allocation); |
1652 page_action_->PaintBadge(&canvas, bounding_rect, tab_id); | 1655 page_action_->PaintBadge(&canvas, bounding_rect, tab_id); |
1653 return FALSE; | 1656 return FALSE; |
1654 } | 1657 } |
OLD | NEW |