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

components/zoom/zoom_controller.cc

 // 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.
 
-#include "components/ui/zoom/zoom_controller.h"
+#include "components/zoom/zoom_controller.h"
 
-#include "components/ui/zoom/zoom_event_manager.h"
-#include "components/ui/zoom/zoom_observer.h"
+#include "components/zoom/zoom_event_manager.h"
+#include "components/zoom/zoom_observer.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_type.h"
 #include "content/public/common/page_zoom.h"
 #include "net/base/url_util.h"
 
-DEFINE_WEB_CONTENTS_USER_DATA_KEY(ui_zoom::ZoomController);
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(zoom::ZoomController);
 
-namespace ui_zoom {
+namespace zoom {
 
 double ZoomController::GetZoomLevelForWebContents(
     const content::WebContents* web_contents) {
   if (!web_contents)
     return 0.0;
 
   auto zoom_controller = FromWebContents(web_contents);
   if (zoom_controller)
     return zoom_controller->GetZoomLevel();
 
   return content::HostZoomMap::GetZoomLevel(web_contents);
 }
 
 ZoomController::ZoomController(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       can_show_bubble_(true),
       zoom_mode_(ZOOM_MODE_DEFAULT),
       zoom_level_(1.0),
       browser_context_(web_contents->GetBrowserContext()) {
   host_zoom_map_ = content::HostZoomMap::GetForWebContents(web_contents);
   zoom_level_ = host_zoom_map_->GetDefaultZoomLevel();
 
   zoom_subscription_ = host_zoom_map_->AddZoomLevelChangedCallback(
       base::Bind(&ZoomController::OnZoomLevelChanged, base::Unretained(this)));
 
   UpdateState(std::string());
 }
 
-ZoomController::~ZoomController() {
-}
+ZoomController::~ZoomController() {}
 
 bool ZoomController::IsAtDefaultZoom() const {
   return content::ZoomValuesEqual(GetZoomLevel(), GetDefaultZoomLevel());
 }
 
 ZoomController::RelativeZoom ZoomController::GetZoomRelativeToDefault() const {
   double current_level = GetZoomLevel();
   double default_level = GetDefaultZoomLevel();
   if (content::ZoomValuesEqual(current_level, default_level))
     return ZOOM_AT_DEFAULT_ZOOM;
@@ skipping 198 matching lines @@
   zoom_mode_ = new_mode;
 }
 
 void ZoomController::ResetZoomModeOnNavigationIfNeeded(const GURL& url) {
   if (zoom_mode_ != ZOOM_MODE_ISOLATED && zoom_mode_ != ZOOM_MODE_MANUAL)
     return;
 
   int render_process_id = web_contents()->GetRenderProcessHost()->GetID();
   int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
   content::HostZoomMap* zoom_map =
-    content::HostZoomMap::GetForWebContents(web_contents());
+      content::HostZoomMap::GetForWebContents(web_contents());
   zoom_level_ = zoom_map->GetDefaultZoomLevel();
   double old_zoom_level = zoom_map->GetZoomLevel(web_contents());
   double new_zoom_level = zoom_map->GetZoomLevelForHostAndScheme(
       url.scheme(), net::GetHostOrSpecFromURL(url));
-  event_data_.reset(new ZoomChangedEventData(
-      web_contents(), old_zoom_level, new_zoom_level, ZOOM_MODE_DEFAULT,
-      false /* can_show_bubble */));
+  event_data_.reset(new ZoomChangedEventData(web_contents(), old_zoom_level,
+                                             new_zoom_level, ZOOM_MODE_DEFAULT,
+                                             false /* can_show_bubble */));
   // The call to ClearTemporaryZoomLevel() doesn't generate any events from
   // HostZoomMap, but the call to UpdateState() at the end of this function
   // will notify our observers.
   // Note: it's possible the render_process/view ids have disappeared (e.g.
   // if we navigated to a new origin), but this won't cause a problem in the
   // call below.
   zoom_map->ClearTemporaryZoomLevel(render_process_id, render_view_id);
   zoom_mode_ = ZOOM_MODE_DEFAULT;
 }
 
@@ skipping 70 matching lines @@
                                           zoom_level, zoom_mode_,
                                           false /* can_show_bubble */);
     FOR_EACH_OBSERVER(ZoomObserver, observers_,
                       OnZoomChanged(zoom_change_data));
   }
 }
 
 void ZoomController::SetPageScaleFactorIsOneForTesting(bool is_one) {
   int render_process_id = web_contents()->GetRenderProcessHost()->GetID();
   int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
-  host_zoom_map_->SetPageScaleFactorIsOneForView(
-      render_process_id, render_view_id, is_one);
+  host_zoom_map_->SetPageScaleFactorIsOneForView(render_process_id,
+                                                 render_view_id, is_one);
 }
 
 bool ZoomController::PageScaleFactorIsOne() const {
   return content::HostZoomMap::PageScaleFactorIsOne(web_contents());
 }
 
-}  // namespace ui_zoom
+}  // namespace zoom