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

chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm

 // Copyright (c) 2011 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/app_menu/app_menu_controller.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/mac/bundle_locations.h"
@@ skipping 18 matching lines @@
 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/toolbar/app_menu_model.h"
 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/ui/zoom/zoom_event_manager.h"
+#include "components/zoom/zoom_event_manager.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace {
 // Padding amounts on the left/right of a custom menu item (like the browser
 // actions overflow container).
 const int kLeftPadding = 16;
 const int kRightPadding = 10;
@@ skipping 37 matching lines @@
     if (!accelerator)
       return false;
     *out_accelerator = *accelerator;
     return true;
   }
 };
 
 class ZoomLevelObserver {
  public:
   ZoomLevelObserver(AppMenuController* controller,
-                    ui_zoom::ZoomEventManager* manager)
+                    zoom::ZoomEventManager* manager)
       : controller_(controller) {
     subscription_ = manager->AddZoomLevelChangedCallback(
         base::Bind(&ZoomLevelObserver::OnZoomLevelChanged,
                    base::Unretained(this)));
   }
 
   ~ZoomLevelObserver() {}
 
  private:
   void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change) {
@@ skipping 236 matching lines @@
   [browserActionsController_ update];
 
   [view setFrameOrigin:NSZeroPoint];
   [[containerView superview] setFrameOrigin:NSZeroPoint];
   [containerView setFrameOrigin:NSMakePoint(kLeftPadding, 0)];
 }
 
 - (void)menuWillOpen:(NSMenu*)menu {
   [super menuWillOpen:menu];
 
-  zoom_level_observer_.reset(
-      new AppMenuControllerInternal::ZoomLevelObserver(
-          self,
-          ui_zoom::ZoomEventManager::GetForBrowserContext(
-              browser_->profile())));
+  zoom_level_observer_.reset(new AppMenuControllerInternal::ZoomLevelObserver(
+      self, zoom::ZoomEventManager::GetForBrowserContext(browser_->profile())));
   NSString* title = base::SysUTF16ToNSString(
       [self appMenuModel]->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY));
   [[[buttonViewController_ zoomItem] viewWithTag:IDC_ZOOM_PERCENT_DISPLAY]
       setTitle:title];
   [[[[buttonViewController_ zoomItem]
       viewWithTag:IDC_ZOOM_MINUS] image]
           setAccessibilityDescription:l10n_util::GetNSString(
               IDS_TEXT_SMALLER_MAC)];
   [[[[buttonViewController_ zoomItem]
       viewWithTag:IDC_ZOOM_PLUS] image]
@@ skipping 264 matching lines @@
   // (and thus, after all our ability to adjust it normally). Throw in the
   // towel, and simply don't let the frame move from where it's supposed to be.
   // TODO(devlin): Yet another Cocoa hack. It'd be good to find a workaround,
   // but unlikely unless we replace the Cocoa menu implementation.
   NSView* containerSuperview = [overflowActionsContainerView_ superview];
   if (NSMinX([containerSuperview frame]) != 0)
     [containerSuperview setFrameOrigin:NSZeroPoint];
 }
 
 @end  // @implementation AppMenuButtonViewController