| 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/views/location_bar/zoom_view.h" | 5 #include "chrome/browser/ui/views/location_bar/zoom_view.h" |
| 6 | 6 |
| 7 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 7 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 8 #include "chrome/browser/ui/view_ids.h" | 8 #include "chrome/browser/ui/view_ids.h" |
| 9 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" | 9 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" |
| 10 #include "chrome/browser/ui/zoom/zoom_controller.h" | |
| 11 #include "chrome/grit/generated_resources.h" | 10 #include "chrome/grit/generated_resources.h" |
| 11 #include "components/ui/zoom/zoom_controller.h" |
| 12 #include "grit/theme_resources.h" |
| 12 #include "ui/accessibility/ax_view_state.h" | 13 #include "ui/accessibility/ax_view_state.h" |
| 13 #include "ui/base/l10n/l10n_util.h" | 14 #include "ui/base/l10n/l10n_util.h" |
| 14 #include "ui/base/resource/resource_bundle.h" | 15 #include "ui/base/resource/resource_bundle.h" |
| 15 #include "ui/events/event.h" | 16 #include "ui/events/event.h" |
| 16 #include "ui/gfx/size.h" | 17 #include "ui/gfx/size.h" |
| 17 | 18 |
| 18 ZoomView::ZoomView(LocationBarView::Delegate* location_bar_delegate) | 19 ZoomView::ZoomView(LocationBarView::Delegate* location_bar_delegate) |
| 19 : BubbleIconView(nullptr, 0), | 20 : BubbleIconView(nullptr, 0), |
| 20 location_bar_delegate_(location_bar_delegate) { | 21 location_bar_delegate_(location_bar_delegate) { |
| 21 Update(NULL); | 22 Update(NULL); |
| 22 } | 23 } |
| 23 | 24 |
| 24 ZoomView::~ZoomView() { | 25 ZoomView::~ZoomView() { |
| 25 } | 26 } |
| 26 | 27 |
| 27 void ZoomView::Update(ZoomController* zoom_controller) { | 28 void ZoomView::Update(ui_zoom::ZoomController* zoom_controller) { |
| 28 if (!zoom_controller || zoom_controller->IsAtDefaultZoom() || | 29 if (!zoom_controller || zoom_controller->IsAtDefaultZoom() || |
| 29 location_bar_delegate_->GetToolbarModel()->input_in_progress()) { | 30 location_bar_delegate_->GetToolbarModel()->input_in_progress()) { |
| 30 SetVisible(false); | 31 SetVisible(false); |
| 31 ZoomBubbleView::CloseBubble(); | 32 ZoomBubbleView::CloseBubble(); |
| 32 return; | 33 return; |
| 33 } | 34 } |
| 34 | 35 |
| 35 SetTooltipText(l10n_util::GetStringFUTF16Int( | 36 SetTooltipText(l10n_util::GetStringFUTF16Int( |
| 36 IDS_TOOLTIP_ZOOM, zoom_controller->GetZoomPercent())); | 37 IDS_TOOLTIP_ZOOM, zoom_controller->GetZoomPercent())); |
| 37 SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( | 38 int image_id = IDR_ZOOM_NORMAL; |
| 38 zoom_controller->GetResourceForZoomLevel())); | 39 ui_zoom::ZoomController::RelativeZoom relative_zoom = |
| 40 zoom_controller->GetZoomRelativeToDefault(); |
| 41 if (relative_zoom == ui_zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM) |
| 42 image_id = IDR_ZOOM_MINUS; |
| 43 else if (relative_zoom == ui_zoom::ZoomController::ZOOM_ABOVE_DEFAULT_ZOOM) |
| 44 image_id = IDR_ZOOM_PLUS; |
| 45 |
| 46 SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(image_id)); |
| 39 SetVisible(true); | 47 SetVisible(true); |
| 40 } | 48 } |
| 41 | 49 |
| 42 bool ZoomView::IsBubbleShowing() const { | 50 bool ZoomView::IsBubbleShowing() const { |
| 43 return ZoomBubbleView::IsShowing(); | 51 return ZoomBubbleView::IsShowing(); |
| 44 } | 52 } |
| 45 | 53 |
| 46 void ZoomView::OnExecuting(BubbleIconView::ExecuteSource source) { | 54 void ZoomView::OnExecuting(BubbleIconView::ExecuteSource source) { |
| 47 ZoomBubbleView::ShowBubble(location_bar_delegate_->GetWebContents(), false); | 55 ZoomBubbleView::ShowBubble(location_bar_delegate_->GetWebContents(), false); |
| 48 } | 56 } |
| 49 | 57 |
| 50 void ZoomView::GetAccessibleState(ui::AXViewState* state) { | 58 void ZoomView::GetAccessibleState(ui::AXViewState* state) { |
| 51 BubbleIconView::GetAccessibleState(state); | 59 BubbleIconView::GetAccessibleState(state); |
| 52 state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_ZOOM); | 60 state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_ZOOM); |
| 53 } | 61 } |
| OLD | NEW |