OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
661 UpdatePageActions(); | 661 UpdatePageActions(); |
662 location_entry_->Update(contents); | 662 location_entry_->Update(contents); |
663 // The security level (background color) could have changed, etc. | 663 // The security level (background color) could have changed, etc. |
664 if (theme_service_->UsingNativeTheme()) { | 664 if (theme_service_->UsingNativeTheme()) { |
665 // In GTK mode, we need our parent to redraw, as it draws the text entry | 665 // In GTK mode, we need our parent to redraw, as it draws the text entry |
666 // border. | 666 // border. |
667 gtk_widget_queue_draw(gtk_widget_get_parent(widget())); | 667 gtk_widget_queue_draw(gtk_widget_get_parent(widget())); |
668 } else { | 668 } else { |
669 gtk_widget_queue_draw(widget()); | 669 gtk_widget_queue_draw(widget()); |
670 } | 670 } |
| 671 ZoomBubbleGtk::Close(); |
671 } | 672 } |
672 | 673 |
673 void LocationBarViewGtk::OnAutocompleteAccept(const GURL& url, | 674 void LocationBarViewGtk::OnAutocompleteAccept(const GURL& url, |
674 WindowOpenDisposition disposition, | 675 WindowOpenDisposition disposition, |
675 content::PageTransition transition, | 676 content::PageTransition transition, |
676 const GURL& alternate_nav_url) { | 677 const GURL& alternate_nav_url) { |
677 if (url.is_valid()) { | 678 if (url.is_valid()) { |
678 location_input_ = UTF8ToUTF16(url.spec()); | 679 location_input_ = UTF8ToUTF16(url.spec()); |
679 disposition_ = disposition; | 680 disposition_ = disposition; |
680 transition_ = content::PageTransitionFromInt( | 681 transition_ = content::PageTransitionFromInt( |
(...skipping 1370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2051 } | 2052 } |
2052 | 2053 |
2053 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( | 2054 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( |
2054 ExtensionAction* action) { | 2055 ExtensionAction* action) { |
2055 ExtensionPopupGtk::Show( | 2056 ExtensionPopupGtk::Show( |
2056 action->GetPopupUrl(current_tab_id_), | 2057 action->GetPopupUrl(current_tab_id_), |
2057 owner_->browser_, | 2058 owner_->browser_, |
2058 event_box_.get(), | 2059 event_box_.get(), |
2059 ExtensionPopupGtk::SHOW_AND_INSPECT); | 2060 ExtensionPopupGtk::SHOW_AND_INSPECT); |
2060 } | 2061 } |
OLD | NEW |