Move base/mac_util.h to base/mac and use the base::mac namespace....

chrome/browser/ui/cocoa/fullscreen_controller.mm

 // Copyright (c) 2010 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 "chrome/browser/ui/cocoa/fullscreen_controller.h"
 
 #include <algorithm>
 
+#import "base/mac/mac_util.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 
 NSString* const kWillEnterFullscreenNotification =
     @"WillEnterFullscreenNotification";
 NSString* const kWillLeaveFullscreenNotification =
     @"WillLeaveFullscreenNotification";
 
 namespace {
 // The activation zone for the main menu is 4 pixels high; if we make it any
@@ skipping 76 matching lines @@
 // Returns YES if the fullscreen window is on the primary screen.
 - (BOOL)isWindowOnPrimaryScreen;
 
 // Returns YES if it is ok to show and hide the menu bar in response to the
 // overlay opening and closing.  Will return NO if the window is not main or not
 // on the primary monitor.
 - (BOOL)shouldToggleMenuBar;
 
 // Returns |kFullScreenModeHideAll| when the overlay is hidden and
 // |kFullScreenModeHideDock| when the overlay is shown.
-- (mac_util::FullScreenMode)desiredFullscreenMode;
+- (base::mac::FullScreenMode)desiredFullscreenMode;
 
 // Change the overlay to the given fraction, with or without animation. Only
 // guaranteed to work properly with |fraction == 0| or |fraction == 1|. This
 // performs the show/hide (animation) immediately. It does not touch the timers.
 - (void)changeOverlayToFraction:(CGFloat)fraction
                   withAnimation:(BOOL)animate;
 
 // Schedule the floating bar to be shown/hidden because of mouse position.
 - (void)scheduleShowForMouse;
 - (void)scheduleHideForMouse;
@@ skipping 43 matching lines @@
 @end
 
 
 @implementation FullscreenController
 
 @synthesize isFullscreen = isFullscreen_;
 
 - (id)initWithBrowserController:(BrowserWindowController*)controller {
   if ((self == [super init])) {
     browserController_ = controller;
-    currentFullscreenMode_ = mac_util::kFullScreenModeNormal;
+    currentFullscreenMode_ = base::mac::kFullScreenModeNormal;
   }
 
   // Let the world know what we're up to.
   [[NSNotificationCenter defaultCenter]
     postNotificationName:kWillEnterFullscreenNotification
                   object:nil];
 
   return self;
 }
 
@@ skipping 128 matching lines @@
   currentAnimation_.reset();
 }
 
 - (CGFloat)floatingBarShownFraction {
   return [browserController_ floatingBarShownFraction];
 }
 
 - (void)changeFloatingBarShownFraction:(CGFloat)fraction {
   [browserController_ setFloatingBarShownFraction:fraction];
 
-  mac_util::FullScreenMode desiredMode = [self desiredFullscreenMode];
+  base::mac::FullScreenMode desiredMode = [self desiredFullscreenMode];
   if (desiredMode != currentFullscreenMode_ && [self shouldToggleMenuBar]) {
-    if (currentFullscreenMode_ == mac_util::kFullScreenModeNormal)
-      mac_util::RequestFullScreen(desiredMode);
+    if (currentFullscreenMode_ == base::mac::kFullScreenModeNormal)
+      base::mac::RequestFullScreen(desiredMode);
     else
-      mac_util::SwitchFullScreenModes(currentFullscreenMode_, desiredMode);
+      base::mac::SwitchFullScreenModes(currentFullscreenMode_, desiredMode);
     currentFullscreenMode_ = desiredMode;
   }
 }
 
 // Used to activate the floating bar in fullscreen mode.
 - (void)mouseEntered:(NSEvent*)event {
   DCHECK(isFullscreen_);
 
   // Having gotten a mouse entered, we no longer need to do exit checks.
   [self cancelMouseExitCheck];
@@ skipping 64 matching lines @@
   NSScreen* screen = [[browserController_ window] screen];
   NSScreen* primaryScreen = [[NSScreen screens] objectAtIndex:0];
   return (screen == primaryScreen);
 }
 
 - (BOOL)shouldToggleMenuBar {
   return [self isWindowOnPrimaryScreen] &&
          [[browserController_ window] isMainWindow];
 }
 
-- (mac_util::FullScreenMode)desiredFullscreenMode {
+- (base::mac::FullScreenMode)desiredFullscreenMode {
   if ([browserController_ floatingBarShownFraction] >= 1.0)
-    return mac_util::kFullScreenModeHideDock;
-  return mac_util::kFullScreenModeHideAll;
+    return base::mac::kFullScreenModeHideDock;
+  return base::mac::kFullScreenModeHideAll;
 }
 
 - (void)changeOverlayToFraction:(CGFloat)fraction
                   withAnimation:(BOOL)animate {
   // The non-animated case is really simple, so do it and return.
   if (!animate) {
     [currentAnimation_ stopAnimation];
     [self changeFloatingBarShownFraction:fraction];
     return;
   }
@@ skipping 179 matching lines @@
   // Call the main status resignation code to perform the associated cleanup,
   // since we will no longer be receiving actual status resignation
   // notifications.
   [self hideActiveWindowUI];
 
   // No more calls back up to the BWC.
   browserController_ = nil;
 }
 
 - (void)showActiveWindowUI {
-  DCHECK_EQ(currentFullscreenMode_, mac_util::kFullScreenModeNormal);
-  if (currentFullscreenMode_ != mac_util::kFullScreenModeNormal)
+  DCHECK_EQ(currentFullscreenMode_, base::mac::kFullScreenModeNormal);
+  if (currentFullscreenMode_ != base::mac::kFullScreenModeNormal)
     return;
 
   if ([self shouldToggleMenuBar]) {
-    mac_util::FullScreenMode desiredMode = [self desiredFullscreenMode];
-    mac_util::RequestFullScreen(desiredMode);
+    base::mac::FullScreenMode desiredMode = [self desiredFullscreenMode];
+    base::mac::RequestFullScreen(desiredMode);
     currentFullscreenMode_ = desiredMode;
   }
 
   // TODO(rohitrao): Insert the Exit Fullscreen button.  http://crbug.com/35956
 }
 
 - (void)hideActiveWindowUI {
-  if (currentFullscreenMode_ != mac_util::kFullScreenModeNormal) {
-    mac_util::ReleaseFullScreen(currentFullscreenMode_);
-    currentFullscreenMode_ = mac_util::kFullScreenModeNormal;
+  if (currentFullscreenMode_ != base::mac::kFullScreenModeNormal) {
+    base::mac::ReleaseFullScreen(currentFullscreenMode_);
+    currentFullscreenMode_ = base::mac::kFullScreenModeNormal;
   }
 
   // TODO(rohitrao): Remove the Exit Fullscreen button.  http://crbug.com/35956
 }
 
 @end