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

chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

 // Copyright (c) 2013 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.
 
 #include "chrome/browser/ui/cocoa/browser/zoom_bubble_controller.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/ui/zoom/page_zoom.h"
-#include "components/ui/zoom/zoom_controller.h"
+#include "components/zoom/page_zoom.h"
+#include "components/zoom/zoom_controller.h"
 #include "content/public/common/page_zoom.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "ui/base/cocoa/hover_button.h"
 #import "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/native_theme/native_theme_mac.h"
 
 @interface ZoomBubbleController (Private)
 - (void)performLayout;
@@ skipping 110 matching lines @@
     return;
 
   // TODO(shess): It may be appropriate to close the window if
   // |contents| or |zoomController| are NULL.  But they can be NULL in
   // tests.
 
   content::WebContents* contents = delegate_->GetWebContents();
   if (!contents)
     return;
 
-  ui_zoom::ZoomController* zoomController =
-      ui_zoom::ZoomController::FromWebContents(contents);
+  zoom::ZoomController* zoomController =
+      zoom::ZoomController::FromWebContents(contents);
   if (!zoomController)
     return;
 
   int percent = zoomController->GetZoomPercent();
   NSString* string = base::SysUTF16ToNSString(base::FormatPercent(percent));
   [zoomPercent_ setAttributedStringValue:
       [self attributedStringWithString:string
                               fontSize:kTextFontSize]];
 
   [self updateAutoCloseTimer];
@@ skipping 160 matching lines @@
 - (void)zoomHelper:(content::PageZoom)alterPageZoom {
   // |delegate| can be null after -windowWillClose:.
   if (!delegate_)
     return;
   content::WebContents* webContents = delegate_->GetWebContents();
 
   // TODO(shess): Zoom() immediately dereferences |webContents|, and
   // there haven't been associated crashes in the wild, so it seems
   // fine in practice.  It might make sense to close the bubble in
   // that case, though.
-  ui_zoom::PageZoom::Zoom(webContents, alterPageZoom);
+  zoom::PageZoom::Zoom(webContents, alterPageZoom);
 }
 
 @end
 
 @implementation ZoomHoverButton
 
 - (void)drawRect:(NSRect)rect {
   NSRect bounds = [self bounds];
   NSAttributedString* title = [self attributedTitle];
   if ([self hoverState] != kHoverStateNone) {
@@ skipping 13 matching lines @@
                           range:NSMakeRange(0, [title length])];
     title = selectedTitle.autorelease();
   }
 
   [[self cell] drawTitle:title
                withFrame:bounds
                   inView:self];
 }
 
 @end