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

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

 // Copyright 2014 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/views/apps/chrome_native_app_window_views.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #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"
 
 using extensions::AppWindow;
 
 namespace {
 
 const int kMinPanelWidth = 100;
 const int kMinPanelHeight = 100;
 const int kDefaultPanelWidth = 200;
@@ skipping 144 matching lines @@
   // registered. This CHECK catches the case.
   CHECK(!is_kiosk_app_mode ||
         accelerator_table.size() ==
             arraysize(kAppWindowAcceleratorMap) +
                 arraysize(kAppWindowKioskAppModeAcceleratorMap));
 
   // Ensure there is a ZoomController in kiosk mode, otherwise the processing
   // 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();
        iter != accelerator_table.end(); ++iter) {
     if (is_kiosk_app_mode && !chrome::IsCommandAllowedInAppMode(iter->second))
       continue;
 
     focus_manager->RegisterAccelerator(
         iter->first, ui::AcceleratorManager::kNormalPriority, this);
   }
@@ skipping 109 matching lines @@
       GetAcceleratorTable();
   std::map<ui::Accelerator, int>::const_iterator iter =
       accelerator_table.find(accelerator);
   DCHECK(iter != accelerator_table.end());
   int command_id = iter->second;
   switch (command_id) {
     case IDC_CLOSE_WINDOW:
       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.";
   }
   return NativeAppWindowViews::AcceleratorPressed(accelerator);
 }
 
 // NativeAppWindow implementation.
 
 void ChromeNativeAppWindowViews::SetFullscreen(int fullscreen_types) {
@@ skipping 40 matching lines @@
     InitializePanelWindow(create_params);
   } else {
     InitializeDefaultWindow(create_params);
   }
   extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews(
       Profile::FromBrowserContext(app_window->browser_context()),
       widget()->GetFocusManager(),
       extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
       NULL));
 }