| 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 1514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1525 if (starred == starred_) | 1525 if (starred == starred_) |
| 1526 return; | 1526 return; |
| 1527 | 1527 |
| 1528 starred_ = starred; | 1528 starred_ = starred; |
| 1529 UpdateStarIcon(); | 1529 UpdateStarIcon(); |
| 1530 } | 1530 } |
| 1531 | 1531 |
| 1532 void LocationBarViewGtk::ZoomChangedForActiveTab(bool can_show_bubble) { | 1532 void LocationBarViewGtk::ZoomChangedForActiveTab(bool can_show_bubble) { |
| 1533 UpdateZoomIcon(); | 1533 UpdateZoomIcon(); |
| 1534 | 1534 |
| 1535 // TODO(dbeam): don't show bubble if the wrench menu is showing. | |
| 1536 if (can_show_bubble && gtk_widget_get_visible(zoom_.get())) | 1535 if (can_show_bubble && gtk_widget_get_visible(zoom_.get())) |
| 1537 ShowZoomBubble(); | 1536 ShowZoomBubble(); |
| 1538 } | 1537 } |
| 1539 | 1538 |
| 1540 void LocationBarViewGtk::UpdateZoomIcon() { | 1539 void LocationBarViewGtk::UpdateZoomIcon() { |
| 1541 TabContents* tab_contents = GetTabContents(); | 1540 TabContents* tab_contents = GetTabContents(); |
| 1542 if (!zoom_.get() || !tab_contents) | 1541 if (!zoom_.get() || !tab_contents) |
| 1543 return; | 1542 return; |
| 1544 | 1543 |
| 1545 ZoomController* zoom_controller = tab_contents->zoom_controller(); | 1544 ZoomController* zoom_controller = tab_contents->zoom_controller(); |
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2132 } | 2131 } |
| 2133 | 2132 |
| 2134 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( | 2133 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( |
| 2135 ExtensionAction* action) { | 2134 ExtensionAction* action) { |
| 2136 ExtensionPopupGtk::Show( | 2135 ExtensionPopupGtk::Show( |
| 2137 action->GetPopupUrl(current_tab_id_), | 2136 action->GetPopupUrl(current_tab_id_), |
| 2138 owner_->browser_, | 2137 owner_->browser_, |
| 2139 event_box_.get(), | 2138 event_box_.get(), |
| 2140 ExtensionPopupGtk::SHOW_AND_INSPECT); | 2139 ExtensionPopupGtk::SHOW_AND_INSPECT); |
| 2141 } | 2140 } |
| OLD | NEW |