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

chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
index 984cac1bf5ae87350ec1f0a1fb6452bfdaf1939b..591895c12483d1bd0feacc976a9410883310828b 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc
@@ -15,8 +15,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "components/favicon/content/content_favicon_driver.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 "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 
@@ -181,7 +181,7 @@ void ChromeNativeAppWindowViews::InitializeDefaultWindow(
   // of the accelerators will cause a crash. Note CHECK here because DCHECK
   // will not be noticed, as this could only be relevant on real hardware.
   CHECK(!is_kiosk_app_mode ||
-        ui_zoom::ZoomController::FromWebContents(web_view()->GetWebContents()));
+        zoom::ZoomController::FromWebContents(web_view()->GetWebContents()));
 
   for (std::map<ui::Accelerator, int>::const_iterator iter =
            accelerator_table.begin();
@@ -311,16 +311,15 @@ bool ChromeNativeAppWindowViews::AcceleratorPressed(
       Close();
       return true;
     case IDC_ZOOM_MINUS:
-      ui_zoom::PageZoom::Zoom(web_view()->GetWebContents(),
-                              content::PAGE_ZOOM_OUT);
+      zoom::PageZoom::Zoom(web_view()->GetWebContents(),
+                           content::PAGE_ZOOM_OUT);
       return true;
     case IDC_ZOOM_NORMAL:
-      ui_zoom::PageZoom::Zoom(web_view()->GetWebContents(),
-                              content::PAGE_ZOOM_RESET);
+      zoom::PageZoom::Zoom(web_view()->GetWebContents(),
+                           content::PAGE_ZOOM_RESET);
       return true;
     case IDC_ZOOM_PLUS:
-      ui_zoom::PageZoom::Zoom(web_view()->GetWebContents(),
-                              content::PAGE_ZOOM_IN);
+      zoom::PageZoom::Zoom(web_view()->GetWebContents(), content::PAGE_ZOOM_IN);
       return true;
     default:
       NOTREACHED() << "Unknown accelerator sent to app window.";