Index: chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm |
diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm |
index 06d7fbe488ab85aa5221c0d7ff445d05e71f68d1..7306dd10c75c8b4cea9d06142bcf406b21529732 100644 |
--- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm |
+++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm |
@@ -11,8 +11,9 @@ |
#import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" |
#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
#import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" |
-#include "chrome/browser/ui/zoom/zoom_controller.h" |
#include "chrome/grit/generated_resources.h" |
+#include "components/ui/zoom/zoom_controller.h" |
+#include "grit/theme_resources.h" |
#include "ui/base/l10n/l10n_util_mac.h" |
ZoomDecoration::ZoomDecoration(LocationBarViewMac* owner) |
@@ -24,7 +25,8 @@ ZoomDecoration::~ZoomDecoration() { |
[bubble_ closeWithoutAnimation]; |
} |
-bool ZoomDecoration::UpdateIfNecessary(ZoomController* zoom_controller) { |
+bool ZoomDecoration::UpdateIfNecessary( |
+ ui_zoom::ZoomController* zoom_controller) { |
if (!ShouldShowDecoration()) { |
if (!IsVisible() && !bubble_) |
return false; |
@@ -77,10 +79,17 @@ void ZoomDecoration::HideUI() { |
SetVisible(false); |
} |
-void ZoomDecoration::ShowAndUpdateUI(ZoomController* zoom_controller, |
+void ZoomDecoration::ShowAndUpdateUI(ui_zoom::ZoomController* zoom_controller, |
NSString* tooltip_string) { |
- SetImage(OmniboxViewMac::ImageForResource( |
- zoom_controller->GetResourceForZoomLevel())); |
+ int image_id = IDR_ZOOM_NORMAL; |
+ ui_zoom::ZoomController::RelativeZoom relative_zoom = |
+ zoom_controller->GetZoomRelativeToDefault(); |
+ if (relative_zoom == ui_zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM) |
+ image_id = IDR_ZOOM_MINUS; |
+ else if (relative_zoom == ui_zoom::ZoomController::ZOOM_ABOVE_DEFAULT_ZOOM) |
+ image_id = IDR_ZOOM_PLUS; |
+ |
+ SetImage(OmniboxViewMac::ImageForResource(image_id)); |
tooltip_.reset([tooltip_string retain]); |
@@ -97,8 +106,8 @@ bool ZoomDecoration::IsAtDefaultZoom() const { |
if (!web_contents) |
return false; |
- ZoomController* zoomController = |
- ZoomController::FromWebContents(web_contents); |
+ ui_zoom::ZoomController* zoomController = |
+ ui_zoom::ZoomController::FromWebContents(web_contents); |
return zoomController && zoomController->IsAtDefaultZoom(); |
} |