Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(736)

Unified Diff: components/ui/zoom/page_zoom.cc

Issue 2019423005: Move //components/ui/zoom to top-level under //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/ui/zoom/page_zoom.h ('k') | components/ui/zoom/page_zoom_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/ui/zoom/page_zoom.cc
diff --git a/components/ui/zoom/page_zoom.cc b/components/ui/zoom/page_zoom.cc
deleted file mode 100644
index fd9710d94b9241602fa86047de828edf6da68c09..0000000000000000000000000000000000000000
--- a/components/ui/zoom/page_zoom.cc
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2015 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/page_zoom.h"
-
-#include <stddef.h>
-
-#include <algorithm>
-#include <cmath>
-
-#include "components/prefs/pref_service.h"
-#include "components/ui/zoom/page_zoom_constants.h"
-#include "components/ui/zoom/zoom_controller.h"
-#include "content/public/browser/host_zoom_map.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/user_metrics.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/common/page_zoom.h"
-#include "content/public/common/renderer_preferences.h"
-
-using base::UserMetricsAction;
-
-namespace {
-
-enum PageZoomValueType {
- PAGE_ZOOM_VALUE_TYPE_FACTOR,
- PAGE_ZOOM_VALUE_TYPE_LEVEL,
-};
-
-std::vector<double> PresetZoomValues(PageZoomValueType value_type,
- double custom_value) {
- // Generate a vector of zoom values from an array of known preset
- // factors. The values in content::kPresetZoomFactors will already be in
- // sorted order.
- std::vector<double> zoom_values;
- bool found_custom = false;
- for (size_t i = 0; i < ui_zoom::kPresetZoomFactorsSize; i++) {
- double zoom_value = ui_zoom::kPresetZoomFactors[i];
- if (value_type == PAGE_ZOOM_VALUE_TYPE_LEVEL)
- zoom_value = content::ZoomFactorToZoomLevel(zoom_value);
- if (content::ZoomValuesEqual(zoom_value, custom_value))
- found_custom = true;
- zoom_values.push_back(zoom_value);
- }
- // If the preset array did not contain the custom value, append it to the
- // vector and then sort.
- double min = value_type == PAGE_ZOOM_VALUE_TYPE_LEVEL ?
- content::ZoomFactorToZoomLevel(content::kMinimumZoomFactor) :
- content::kMinimumZoomFactor;
- double max = value_type == PAGE_ZOOM_VALUE_TYPE_LEVEL ?
- content::ZoomFactorToZoomLevel(content::kMaximumZoomFactor) :
- content::kMaximumZoomFactor;
- if (!found_custom && custom_value > min && custom_value < max) {
- zoom_values.push_back(custom_value);
- std::sort(zoom_values.begin(), zoom_values.end());
- }
- return zoom_values;
-}
-
-} // namespace anonymous
-
-namespace ui_zoom {
-
-// static
-std::vector<double> PageZoom::PresetZoomFactors(double custom_factor) {
- return PresetZoomValues(PAGE_ZOOM_VALUE_TYPE_FACTOR, custom_factor);
-}
-
-// static
-std::vector<double> PageZoom::PresetZoomLevels(double custom_level) {
- return PresetZoomValues(PAGE_ZOOM_VALUE_TYPE_LEVEL, custom_level);
-}
-
-// static
-void PageZoom::Zoom(content::WebContents* web_contents,
- content::PageZoom zoom) {
- ui_zoom::ZoomController* zoom_controller =
- ui_zoom::ZoomController::FromWebContents(web_contents);
- if (!zoom_controller)
- return;
-
- double current_zoom_level = zoom_controller->GetZoomLevel();
- double default_zoom_level = zoom_controller->GetDefaultZoomLevel();
-
- if (zoom == content::PAGE_ZOOM_RESET) {
- zoom_controller->SetZoomLevel(default_zoom_level);
- web_contents->SetPageScale(1.f);
- content::RecordAction(UserMetricsAction("ZoomNormal"));
- return;
- }
-
- // Generate a vector of zoom levels from an array of known presets along with
- // the default level added if necessary.
- std::vector<double> zoom_levels = PresetZoomLevels(default_zoom_level);
-
- if (zoom == content::PAGE_ZOOM_OUT) {
- // Iterate through the zoom levels in reverse order to find the next
- // lower level based on the current zoom level for this page.
- for (std::vector<double>::reverse_iterator i = zoom_levels.rbegin();
- i != zoom_levels.rend(); ++i) {
- double zoom_level = *i;
- if (content::ZoomValuesEqual(zoom_level, current_zoom_level))
- continue;
- if (zoom_level < current_zoom_level) {
- zoom_controller->SetZoomLevel(zoom_level);
- content::RecordAction(UserMetricsAction("ZoomMinus"));
- return;
- }
- }
- content::RecordAction(UserMetricsAction("ZoomMinus_AtMinimum"));
- } else {
- // Iterate through the zoom levels in normal order to find the next
- // higher level based on the current zoom level for this page.
- for (std::vector<double>::const_iterator i = zoom_levels.begin();
- i != zoom_levels.end(); ++i) {
- double zoom_level = *i;
- if (content::ZoomValuesEqual(zoom_level, current_zoom_level))
- continue;
- if (zoom_level > current_zoom_level) {
- zoom_controller->SetZoomLevel(zoom_level);
- content::RecordAction(UserMetricsAction("ZoomPlus"));
- return;
- }
- }
- content::RecordAction(UserMetricsAction("ZoomPlus_AtMaximum"));
- }
-}
-
-} // namespace ui_zoom
« no previous file with comments | « components/ui/zoom/page_zoom.h ('k') | components/ui/zoom/page_zoom_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698