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

chrome/browser/plugin_process_host_mac.cc

 // Copyright (c) 2009 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 <Carbon/Carbon.h>
 
 #include "build/build_config.h"
 
 #include <vector>
 
 #include "base/logging.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/plugin_process_host.h"
 #include "chrome/common/plugin_messages.h"
 #include "gfx/rect.h"
 
 void PluginProcessHost::OnPluginSelectWindow(uint32 window_id,
                                              gfx::Rect window_rect,
                                              bool modal) {
   plugin_visible_windows_set_.insert(window_id);
   if (modal)
@@ skipping 14 matching lines @@
   if (CGRectEqualToRect(window_bounds, main_display_bounds) &&
       (plugin_fullscreen_windows_set_.find(window_id) ==
        plugin_fullscreen_windows_set_.end())) {
     plugin_fullscreen_windows_set_.insert(window_id);
     // If the plugin has just shown a window that's the same dimensions as
     // the main display, hide the menubar so that it has the whole screen.
     // (but only if we haven't already seen this fullscreen window, since
     // otherwise our refcounting can get skewed).
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
-        NewRunnableFunction(mac_util::RequestFullScreen,
-                            mac_util::kFullScreenModeHideAll));
+        NewRunnableFunction(base::mac::RequestFullScreen,
+                            base::mac::kFullScreenModeHideAll));
   }
 }
 
 // Must be called on the UI thread.
 // If plugin_pid is -1, the browser will be the active process on return,
 // otherwise that process will be given focus back before this function returns.
 static void ReleasePluginFullScreen(pid_t plugin_pid) {
   // Releasing full screen only works if we are the frontmost process; grab
   // focus, but give it back to the plugin process if requested.
-  mac_util::ActivateProcess(base::GetCurrentProcId());
-  mac_util::ReleaseFullScreen(mac_util::kFullScreenModeHideAll);
+  base::mac::ActivateProcess(base::GetCurrentProcId());
+  base::mac::ReleaseFullScreen(base::mac::kFullScreenModeHideAll);
   if (plugin_pid != -1) {
-    mac_util::ActivateProcess(plugin_pid);
+    base::mac::ActivateProcess(plugin_pid);
   }
 }
 
 void PluginProcessHost::OnPluginHideWindow(uint32 window_id,
                                            gfx::Rect window_rect) {
   bool had_windows = !plugin_visible_windows_set_.empty();
   plugin_visible_windows_set_.erase(window_id);
   bool browser_needs_activation = had_windows &&
       plugin_visible_windows_set_.empty();
 
   plugin_modal_windows_set_.erase(window_id);
   if (plugin_fullscreen_windows_set_.find(window_id) !=
       plugin_fullscreen_windows_set_.end()) {
     plugin_fullscreen_windows_set_.erase(window_id);
     pid_t plugin_pid = browser_needs_activation ? -1 : handle();
     browser_needs_activation = false;
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         NewRunnableFunction(ReleasePluginFullScreen, plugin_pid));
   }
 
   if (browser_needs_activation) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
-        NewRunnableFunction(mac_util::ActivateProcess,
+        NewRunnableFunction(base::mac::ActivateProcess,
                             base::GetCurrentProcId()));
   }
 }
 
 void PluginProcessHost::OnAppActivation() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // If our plugin process has any modal windows up, we need to bring it forward
   // so that they act more like an in-process modal window would.
   if (!plugin_modal_windows_set_.empty()) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
-        NewRunnableFunction(mac_util::ActivateProcess, handle()));
+        NewRunnableFunction(base::mac::ActivateProcess, handle()));
   }
 }
 
 void PluginProcessHost::OnPluginSetCursorVisibility(bool visible) {
   if (plugin_cursor_visible_ != visible) {
     plugin_cursor_visible_ = visible;
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
-        NewRunnableFunction(mac_util::SetCursorVisibility,
+        NewRunnableFunction(base::mac::SetCursorVisibility,
                             visible));
   }
 }