Move //components/ui/zoom to top-level under //components

chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #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/grit/generated_resources.h"
-#include "components/ui/zoom/zoom_controller.h"
+#include "components/zoom/zoom_controller.h"
 #include "grit/theme_resources.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/material_design/material_design_controller.h"
 
 ZoomDecoration::ZoomDecoration(LocationBarViewMac* owner)
     : owner_(owner),
       bubble_(nil),
       vector_icon_id_(gfx::VectorIconId::VECTOR_ICON_NONE) {}
 
 ZoomDecoration::~ZoomDecoration() {
   [bubble_ closeWithoutAnimation];
   bubble_.delegate = nil;
 }
 
-bool ZoomDecoration::UpdateIfNecessary(
-    ui_zoom::ZoomController* zoom_controller,
-    bool default_zoom_changed,
-    bool location_bar_is_dark) {
+bool ZoomDecoration::UpdateIfNecessary(zoom::ZoomController* zoom_controller,
+                                       bool default_zoom_changed,
+                                       bool location_bar_is_dark) {
   if (!ShouldShowDecoration()) {
     if (!IsVisible() && !bubble_)
       return false;
 
     HideUI();
     return true;
   }
 
   base::string16 zoom_percent =
       base::FormatPercent(zoom_controller->GetZoomPercent());
@@ skipping 38 matching lines @@
 
 void ZoomDecoration::CloseBubble() {
   [bubble_ close];
 }
 
 void ZoomDecoration::HideUI() {
   [bubble_ close];
   SetVisible(false);
 }
 
-void ZoomDecoration::ShowAndUpdateUI(ui_zoom::ZoomController* zoom_controller,
+void ZoomDecoration::ShowAndUpdateUI(zoom::ZoomController* zoom_controller,
                                      NSString* tooltip_string,
                                      bool location_bar_is_dark) {
   if (ui::MaterialDesignController::IsModeMaterial()) {
     vector_icon_id_ = gfx::VectorIconId::VECTOR_ICON_NONE;
-    ui_zoom::ZoomController::RelativeZoom relative_zoom =
+    zoom::ZoomController::RelativeZoom relative_zoom =
         zoom_controller->GetZoomRelativeToDefault();
-    if (relative_zoom == ui_zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM) {
+    if (relative_zoom == zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM) {
       vector_icon_id_ = gfx::VectorIconId::ZOOM_MINUS;
-    } else if (relative_zoom ==
-               ui_zoom::ZoomController::ZOOM_ABOVE_DEFAULT_ZOOM) {
+    } else if (relative_zoom == zoom::ZoomController::ZOOM_ABOVE_DEFAULT_ZOOM) {
       vector_icon_id_ = gfx::VectorIconId::ZOOM_PLUS;
     }
 
     SetImage(GetMaterialIcon(location_bar_is_dark));
   } else {
     int image_id = IDR_ZOOM_NORMAL;
-    ui_zoom::ZoomController::RelativeZoom relative_zoom =
+    zoom::ZoomController::RelativeZoom relative_zoom =
         zoom_controller->GetZoomRelativeToDefault();
-    if (relative_zoom == ui_zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM)
+    if (relative_zoom == zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM)
       image_id = IDR_ZOOM_MINUS;
-    else if (relative_zoom == ui_zoom::ZoomController::ZOOM_ABOVE_DEFAULT_ZOOM)
+    else if (relative_zoom == zoom::ZoomController::ZOOM_ABOVE_DEFAULT_ZOOM)
       image_id = IDR_ZOOM_PLUS;
 
     SetImage(OmniboxViewMac::ImageForResource(image_id));
   }
 
   tooltip_.reset([tooltip_string retain]);
 
   SetVisible(true);
   [bubble_ onZoomChanged];
 }
 
 NSPoint ZoomDecoration::GetBubblePointInFrame(NSRect frame) {
   return NSMakePoint(NSMaxX(frame), NSMaxY(frame));
 }
 
 bool ZoomDecoration::IsAtDefaultZoom() const {
   content::WebContents* web_contents = owner_->GetWebContents();
   if (!web_contents)
     return false;
 
-  ui_zoom::ZoomController* zoomController =
-      ui_zoom::ZoomController::FromWebContents(web_contents);
+  zoom::ZoomController* zoomController =
+      zoom::ZoomController::FromWebContents(web_contents);
   return zoomController && zoomController->IsAtDefaultZoom();
 }
 
 bool ZoomDecoration::ShouldShowDecoration() const {
   return owner_->GetWebContents() != NULL &&
       !owner_->GetToolbarModel()->input_in_progress() &&
       (bubble_ || !IsAtDefaultZoom());
 }
 
 bool ZoomDecoration::AcceptsMousePress() {
@@ skipping 25 matching lines @@
   // closed the decoration can be hidden.
   if (IsAtDefaultZoom() && IsVisible()) {
     SetVisible(false);
     owner_->OnDecorationsChanged();
   }
 }
 
 gfx::VectorIconId ZoomDecoration::GetMaterialVectorIconId() const {
   return vector_icon_id_;
 }