Move ZoomObserver, ZoomController and ZoomEventManager to components/.

chrome/browser/ui/views/location_bar/zoom_view.cc

Index: chrome/browser/ui/views/location_bar/zoom_view.cc
diff --git a/chrome/browser/ui/views/location_bar/zoom_view.cc b/chrome/browser/ui/views/location_bar/zoom_view.cc
index c2dbf04609242757fb2a5e29e3d9c78a6519944c..a3852bbaff3f42cb8700f9842d91a8054d76ce71 100644
--- a/chrome/browser/ui/views/location_bar/zoom_view.cc
+++ b/chrome/browser/ui/views/location_bar/zoom_view.cc
@@ -7,8 +7,9 @@
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
-#include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/grit/generated_resources.h"
+#include "extensions/browser/ui/zoom/zoom_controller.h"
+#include "grit/theme_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -24,7 +25,7 @@ ZoomView::ZoomView(LocationBarView::Delegate* location_bar_delegate)
 ZoomView::~ZoomView() {
 }
 
-void ZoomView::Update(ZoomController* zoom_controller) {
+void ZoomView::Update(extensions::ZoomController* zoom_controller) {
   if (!zoom_controller || zoom_controller->IsAtDefaultZoom() ||
       location_bar_delegate_->GetToolbarModel()->input_in_progress()) {
     SetVisible(false);
@@ -34,8 +35,19 @@ void ZoomView::Update(ZoomController* zoom_controller) {
 
   SetTooltipText(l10n_util::GetStringFUTF16Int(
       IDS_TOOLTIP_ZOOM, zoom_controller->GetZoomPercent()));
-  SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-      zoom_controller->GetResourceForZoomLevel()));
+  int image_name;
+  switch (zoom_controller->GetZoomRelativeToDefault()) {
+    case extensions::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM:
+      image_name = IDR_ZOOM_MINUS;
+      break;
+    case extensions::ZoomController::ZOOM_ABOVE_DEFAULT_ZOOM:
+      image_name = IDR_ZOOM_PLUS;
+      break;
+    default:
+      image_name = IDR_ZOOM_NORMAL;
+  }

[Peter Kasting, 2014/12/02 21:04:54]

Nit: Shorter:

  int image_name = IDR_ZOOM_NORMAL;
  extensions::ZoomController::RelativeZoom relative_zoom =
      zoom_controller->GetZoomRelativeToDefault();
  if (relative_zoom == extensions::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM)
    image_name = IDR_ZOOM_MINUS;
  else if (relative_zoom == extensions::ZoomController::ZOOM_ABOVE_DEFAULT_ZOOM)
    image_name = IDR_ZOOM_PLUS;

+  SetImage(
+      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(image_name));
   SetVisible(true);
 }