Moves overscroll code out of the ios_internal namespace.

ios/chrome/browser/ui/overscroll_actions/overscroll_actions_view.mm

 // 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.
 
 #import "ios/chrome/browser/ui/overscroll_actions/overscroll_actions_view.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include "base/logging.h"
 #include "base/mac/objc_property_releaser.h"
@@ skipping 120 matching lines @@
   // it.
   base::scoped_nsobject<UITapGestureRecognizer> _tapGesture;
   // Array of layers that will be centered vertically.
   // The array is built the first time the method -layersToCenterVertically is
   // called.
   base::scoped_nsobject<NSArray> _layersToCenterVertically;
   base::mac::ObjCPropertyReleaser _propertyReleaser_OverscrollActionsView;
 }
 
 // Redefined to readwrite.
-@property(nonatomic, assign, readwrite)
-    ios_internal::OverscrollAction selectedAction;
+@property(nonatomic, assign, readwrite) OverscrollAction selectedAction;
 
 // Actions image views.
 @property(nonatomic, retain) UIImageView* addTabActionImageView;
 @property(nonatomic, retain) UIImageView* refreshActionImageView;
 @property(nonatomic, retain) UIImageView* closeTabActionImageView;
 
 @property(nonatomic, retain) CALayer* highlightMaskLayer;
 
 @property(nonatomic, retain) UIImageView* addTabActionImageViewHighlighted;
 @property(nonatomic, retain) UIImageView* refreshActionImageViewHighlighted;
@@ skipping 48 matching lines @@
 // Called when the state changes in order to perform state dependent animations.
 - (void)onStateChange;
 // Resets values related to selection state.
 - (void)resetSelection;
 // Returns a newly allocated and configured selection circle shape.
 - (CAShapeLayer*)newSelectionCircleLayer;
 // Returns an autoreleased circular bezier path horizontally deformed according
 // to |dx|.
 - (UIBezierPath*)circlePath:(CGFloat)dx;
 // Returns the action at the given location in the view.
-- (ios_internal::OverscrollAction)actionAtLocation:(CGPoint)location;
+- (OverscrollAction)actionAtLocation:(CGPoint)location;
 // Update the selection circle frame to select the given action.
-- (void)updateSelectionForTouchedAction:(ios_internal::OverscrollAction)action;
+- (void)updateSelectionForTouchedAction:(OverscrollAction)action;
 // Clear the direct touch interaction after a small delay to prevent graphic
 // glitch with pan gesture selection deformation animations.
 - (void)clearDirectTouchInteraction;
 @end
 
 @implementation OverscrollActionsView
 
 @synthesize selectedAction = _selectedAction;
 @synthesize addTabActionImageView = _addTabActionImageView;
 @synthesize refreshActionImageView = _refreshActionImageView;
@@ skipping 386 matching lines @@
     else
       [CATransaction setAnimationDuration:kSelectionSnappingAnimationDuration];
     self.selectionCircleLayer.position = [self selectionCirclePosition];
     self.selectionCircleMaskLayer.position = self.selectionCircleLayer.position;
     [CATransaction commit];
   }
 }
 
 - (void)updateSelectedAction {
   if (self.overscrollState != OverscrollViewState::READY) {
-    self.selectedAction = ios_internal::OverscrollAction::NONE;
+    self.selectedAction = OverscrollAction::NONE;
     return;
   }
 
   // Update action index by checking that the action image layer is included
   // inside the selection layer.
   const CGPoint selectionPosition = [self selectionCirclePosition];
   if (_deformationBehaviorEnabled) {
     const CGFloat distanceBetweenTwoActions =
         (self.refreshActionImageView.frame.origin.x -
          self.addTabActionImageView.frame.origin.x) /
         2;
     if (fabs(self.addTabActionImageView.center.x - selectionPosition.x) <
         distanceBetweenTwoActions) {
-      self.selectedAction = ios_internal::OverscrollAction::NEW_TAB;
+      self.selectedAction = OverscrollAction::NEW_TAB;
     }
     if (fabs(self.refreshActionImageView.center.x - selectionPosition.x) <
         distanceBetweenTwoActions) {
-      self.selectedAction = ios_internal::OverscrollAction::REFRESH;
+      self.selectedAction = OverscrollAction::REFRESH;
     }
     if (fabs(self.closeTabActionImageView.center.x - selectionPosition.x) <
         distanceBetweenTwoActions) {
-      self.selectedAction = ios_internal::OverscrollAction::CLOSE_TAB;
+      self.selectedAction = OverscrollAction::CLOSE_TAB;
     }
   } else {
     const CGRect selectionRect =
         CGRectMake(selectionPosition.x - kSelectionEdge / 2.0,
                    selectionPosition.y - kSelectionEdge / 2.0, kSelectionEdge,
                    kSelectionEdge);
     const CGRect addTabRect = self.addTabActionImageView.frame;
     const CGRect closeTabRect = self.closeTabActionImageView.frame;
     const CGRect refreshRect = self.refreshActionImageView.frame;
 
     if (CGRectContainsRect(selectionRect, addTabRect)) {
-      self.selectedAction = ios_internal::OverscrollAction::NEW_TAB;
+      self.selectedAction = OverscrollAction::NEW_TAB;
     } else if (CGRectContainsRect(selectionRect, refreshRect)) {
-      self.selectedAction = ios_internal::OverscrollAction::REFRESH;
+      self.selectedAction = OverscrollAction::REFRESH;
     } else if (CGRectContainsRect(selectionRect, closeTabRect)) {
-      self.selectedAction = ios_internal::OverscrollAction::CLOSE_TAB;
+      self.selectedAction = OverscrollAction::CLOSE_TAB;
     } else {
-      self.selectedAction = ios_internal::OverscrollAction::NONE;
+      self.selectedAction = OverscrollAction::NONE;
     }
   }
 }
 
-- (void)setSelectedAction:(ios_internal::OverscrollAction)action {
+- (void)setSelectedAction:(OverscrollAction)action {
   if (_selectedAction != action) {
     _selectedAction = action;
     [self onSelectedActionChange];
   }
 }
 
 - (void)onSelectedActionChange {
   if (self.overscrollState == OverscrollViewState::PREPARE ||
       _animatingActionTrigger)
     return;
 
   [UIView beginAnimations:@"transform" context:NULL];
   [UIView setAnimationDuration:kSelectionSnappingAnimationDuration];
-  if (self.selectedAction == ios_internal::OverscrollAction::NONE) {
+  if (self.selectedAction == OverscrollAction::NONE) {
     if (!_deformationBehaviorEnabled) {
       // Scale selection down.
       self.selectionCircleLayer.transform =
           CATransform3DMakeScale(kSelectionDownScale, kSelectionDownScale, 1);
       self.selectionCircleMaskLayer.transform =
           self.selectionCircleLayer.transform;
     }
   } else {
     // Scale selection up.
     self.selectionCircleLayer.transform = CATransform3DMakeScale(1, 1, 1);
@@ skipping 138 matching lines @@
       [path moveToPoint:p];
     } else {
       [path addLineToPoint:p];
     }
   }
 
   [path closePath];
   return path;
 }
 
-- (void)setStyle:(ios_internal::OverscrollStyle)style {
+- (void)setStyle:(OverscrollStyle)style {
   switch (style) {
-    case ios_internal::OverscrollStyle::NTP_NON_INCOGNITO:
+    case OverscrollStyle::NTP_NON_INCOGNITO:
       [self.shadowView setHidden:YES];
       self.backgroundColor = [UIColor whiteColor];
       break;
-    case ios_internal::OverscrollStyle::NTP_INCOGNITO:
+    case OverscrollStyle::NTP_INCOGNITO:
       [self.shadowView setHidden:YES];
       self.backgroundColor = [UIColor colorWithWhite:0 alpha:0];
       break;
-    case ios_internal::OverscrollStyle::REGULAR_PAGE_NON_INCOGNITO:
+    case OverscrollStyle::REGULAR_PAGE_NON_INCOGNITO:
       [self.shadowView setHidden:NO];
       self.backgroundColor = [UIColor colorWithRed:242.0 / 256
                                              green:242.0 / 256
                                               blue:242.0 / 256
                                              alpha:1.0];
       break;
-    case ios_internal::OverscrollStyle::REGULAR_PAGE_INCOGNITO:
+    case OverscrollStyle::REGULAR_PAGE_INCOGNITO:
       [self.shadowView setHidden:NO];
       self.backgroundColor = [UIColor colorWithRed:80.0 / 256
                                              green:80.0 / 256
                                               blue:80.0 / 256
                                              alpha:1.0];
       break;
   }
 
-  BOOL incognito =
-      style == ios_internal::OverscrollStyle::NTP_INCOGNITO ||
-      style == ios_internal::OverscrollStyle::REGULAR_PAGE_INCOGNITO;
+  BOOL incognito = style == OverscrollStyle::NTP_INCOGNITO ||
+                   style == OverscrollStyle::REGULAR_PAGE_INCOGNITO;
   if (incognito) {
     [_addTabActionImageView
         setImage:[UIImage imageNamed:kNewTabActionActiveImage]];
     [_refreshActionImageView
         setImage:[UIImage imageNamed:kRefreshActionActiveImage]];
     [_closeTabActionImageView
         setImage:[UIImage imageNamed:kCloseActionActiveImage]];
     _selectionCircleLayer.fillColor =
         [[UIColor colorWithRed:1 green:1 blue:1 alpha:0.2] CGColor];
     _selectionCircleMaskLayer.fillColor = [[UIColor clearColor] CGColor];
@@ skipping 16 matching lines @@
     _selectionCircleMaskLayer.fillColor = [[UIColor blackColor] CGColor];
   }
   [_addTabActionImageView sizeToFit];
   [_refreshActionImageView sizeToFit];
   [_closeTabActionImageView sizeToFit];
   [_addTabActionImageViewHighlighted sizeToFit];
   [_refreshActionImageViewHighlighted sizeToFit];
   [_closeTabActionImageViewHighlighted sizeToFit];
 }
 
-- (ios_internal::OverscrollAction)actionAtLocation:(CGPoint)location {
-  ios_internal::OverscrollAction action = ios_internal::OverscrollAction::NONE;
+- (OverscrollAction)actionAtLocation:(CGPoint)location {
+  OverscrollAction action = OverscrollAction::NONE;
   if (CGRectContainsPoint(
           CGRectInset([_addTabActionImageView frame],
                       -kDirectTouchFrameExpansion, -kDirectTouchFrameExpansion),
           location)) {
-    action = ios_internal::OverscrollAction::NEW_TAB;
+    action = OverscrollAction::NEW_TAB;
   } else if (CGRectContainsPoint(CGRectInset([_refreshActionImageView frame],
                                              -kDirectTouchFrameExpansion,
                                              -kDirectTouchFrameExpansion),
                                  location)) {
-    action = ios_internal::OverscrollAction::REFRESH;
+    action = OverscrollAction::REFRESH;
   } else if (CGRectContainsPoint(CGRectInset([_closeTabActionImageView frame],
                                              -kDirectTouchFrameExpansion,
                                              -kDirectTouchFrameExpansion),
                                  location)) {
-    action = ios_internal::OverscrollAction::CLOSE_TAB;
+    action = OverscrollAction::CLOSE_TAB;
   }
   return action;
 }
 
-- (void)updateSelectionForTouchedAction:(ios_internal::OverscrollAction)action {
+- (void)updateSelectionForTouchedAction:(OverscrollAction)action {
   switch (action) {
-    case ios_internal::OverscrollAction::NEW_TAB:
+    case OverscrollAction::NEW_TAB:
       [self updateWithHorizontalOffset:-1];
       break;
-    case ios_internal::OverscrollAction::REFRESH:
+    case OverscrollAction::REFRESH:
       [self updateWithHorizontalOffset:0];
       break;
-    case ios_internal::OverscrollAction::CLOSE_TAB:
+    case OverscrollAction::CLOSE_TAB:
       [self updateWithHorizontalOffset:1];
       break;
-    case ios_internal::OverscrollAction::NONE:
+    case OverscrollAction::NONE:
       return;
       break;
   }
 }
 
 // Clear the direct touch interaction after a small delay to prevent graphic
 // glitch with pan gesture selection deformation animations.
 - (void)clearDirectTouchInteraction {
   if (!_viewTouched)
     return;
@@ skipping 35 matching lines @@
 - (BOOL)gestureRecognizer:(UIGestureRecognizer*)gestureRecognizer
     shouldRecognizeSimultaneouslyWithGestureRecognizer:
         (UIGestureRecognizer*)otherGestureRecognizer {
   return YES;
 }
 
 #pragma mark - Tap gesture action
 
 - (void)tapGesture:(UITapGestureRecognizer*)tapRecognizer {
   CGPoint tapLocation = [tapRecognizer locationInView:self];
-  ios_internal::OverscrollAction action = [self actionAtLocation:tapLocation];
-  if (action != ios_internal::OverscrollAction::NONE) {
+  OverscrollAction action = [self actionAtLocation:tapLocation];
+  if (action != OverscrollAction::NONE) {
     [self updateSelectionForTouchedAction:action];
     [self setSelectedAction:action];
     [self.delegate overscrollActionsViewDidTapTriggerAction:self];
   }
 }
 
 @end