In preparation for becoming an internal plugin in chrome I did these things:...

plugin/mac/plugin_mac.mm

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 22 matching lines @@
 
 #include "plugin_mac.h"
 #include <Breakpad/Breakpad.h>
 #include <Cocoa/Cocoa.h>
 #include <QuickTime/QuickTime.h>
 #include "plugin/cross/o3d_glue.h"
 #include "plugin/cross/main.h"
 #include "core/mac/display_window_mac.h"
 #include "plugin/mac/graphics_utils_mac.h"
 
+#if !defined(O3D_INTERNAL_PLUGIN)
 BreakpadRef gBreakpadRef =  NULL;
+#endif
 
 using glue::_o3d::PluginObject;
 using o3d::DisplayWindowMac;
 
+@interface NSWindowController (plugin_hack)
+- (id)selectedTab;
+@end
+
+namespace o3d {
 
 // Returns the version number of the running Mac browser, as parsed from
 // the short version string in the plist of the app's bundle.
 bool GetBrowserVersionInfo(int *returned_major,
                            int *returned_minor,
                            int *returned_bugfix) {
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
   int major = 0;
   int minor = 0;
   int bugfix = 0;
@@ skipping 39 matching lines @@
 // the walk from windowref to cocoa window (of type "BrowserWindow") to cocoa
 // windowcontroller to selectedTab should harmlessly break down somewhere along
 // the way.
 //
 // This is useful merely for peeking at Safari's internal state for a tab change
 // event, as Safari does not notify us when this happens.  It coerces the value
 // to a void*, as the plain .cc files don't like the type id, and we actually
 // only care whether the value changes or not.
 
 
-@interface NSWindowController (plugin_hack)
-- (id)selectedTab;
-@end
-
 void ReleaseSafariBrowserWindow(void* browserWindow) {
   NSWindow* cocoaWindow = (NSWindow*) browserWindow;
   [cocoaWindow release];
 }
 
 void* SafariBrowserWindowForWindowRef(WindowRef theWindow) {
   if (theWindow != NULL) {
     NSWindow* cocoaWindow = [[NSWindow alloc] initWithWindowRef:theWindow];
     if (cocoaWindow) {
       if (strcmp(object_getClassName(cocoaWindow), "BrowserWindow") == 0) {
@@ skipping 762 matching lines @@
   NSArray* mac_modes = (NSArray*)CGDisplayAvailableModes(CGMainDisplayID());
   int num_modes = [mac_modes count];
   std::vector<o3d::DisplayMode> modes_found;
 
   for (int i = 0; i < num_modes; ++i) {
     int width = 0;
     int height = 0;
     int refresh_rate = 0;
     int bpp = 0;
 
-    if (ExtractDisplayModeData([mac_modes objectAtIndex:i],
+    if (o3d::ExtractDisplayModeData([mac_modes objectAtIndex:i],
         &width,
         &height,
         &refresh_rate,
         &bpp) && bpp == 32)
       modes_found.push_back(o3d::DisplayMode(width, height, refresh_rate,
-                                             i + kO3D_MODE_OFFSET));
+                                             i + o3d::kO3D_MODE_OFFSET));
   }
 
   modes->swap(modes_found);
 }
 
 
 #pragma mark ____FULLSCREEN_SWITCHING
 
 #define kTransitionTime 1.0
 
@@ skipping 32 matching lines @@
                     &short_target_width,
                     &short_target_height,
                     &fullscreen_window,
                     NULL,
                     fullScreenCaptureAllDisplays);
   } else {
     SetSystemUIMode(kUIModeAllSuppressed, kUIOptionAutoShowMenuBar);
     mac_fullscreen_state_ = NULL;
   }
 
-  SetFullscreenMacWindow(CreateFullscreenWindow(NULL,
-                                                this,
-                                                fullscreen_region_mode_id_));
+  SetFullscreenMacWindow(o3d::CreateFullscreenWindow(
+      NULL,
+      this,
+      fullscreen_region_mode_id_));
   Rect bounds = {0,0,0,0};
   GetWindowBounds(GetFullscreenMacWindow(), kWindowContentRgn, &bounds);
 
-  SetWindowForAGLContext(mac_agl_context_, GetFullscreenMacWindow());
+  o3d::SetWindowForAGLContext(mac_agl_context_, GetFullscreenMacWindow());
   aglDisable(mac_agl_context_, AGL_BUFFER_RECT);
   renderer()->SetClientOriginOffset(0, 0);
   renderer_->Resize(bounds.right - bounds.left, bounds.bottom - bounds.top);
 
   fullscreen_ = true;
   client()->SendResizeEvent(renderer_->width(), renderer_->height(), true);
 
-  SetFullscreenOverlayMacWindow(CreateOverlayWindow());
+  SetFullscreenOverlayMacWindow(o3d::CreateOverlayWindow());
   ShowWindow(mac_fullscreen_overlay_window_);
-  SlideWindowToRect(mac_fullscreen_overlay_window_,
-                    Rect2CGRect(GetOverlayWindowRect(true)),
-                    kTransitionTime);
+  o3d::SlideWindowToRect(mac_fullscreen_overlay_window_,
+                         o3d::Rect2CGRect(o3d::GetOverlayWindowRect(true)),
+                         kTransitionTime);
 
   // Hide the overlay text 4 seconds from now.
   time_to_hide_overlay_ = [NSDate timeIntervalSinceReferenceDate] + 4.0;
 
   return true;
 }
 
 void PluginObject::CancelFullscreenDisplay() {
   // if not in fullscreen mode, do nothing
   if (!GetFullscreenMacWindow())
     return;
 
-  SetWindowForAGLContext(mac_agl_context_, mac_window_);
+  o3d::SetWindowForAGLContext(mac_agl_context_, mac_window_);
 
-  CleanupFullscreenWindow(this);
+  o3d::CleanupFullscreenWindow(this);
 
   renderer_->Resize(prev_width_, prev_height_);
   aglSetInteger(mac_agl_context_, AGL_BUFFER_RECT, last_buffer_rect_);
   aglEnable(mac_agl_context_, AGL_BUFFER_RECT);
 
   if (mac_fullscreen_state_) {
     EndFullScreen(mac_fullscreen_state_, 0);
     mac_fullscreen_state_ = NULL;
   } else {
     SetSystemUIMode(kUIModeNormal, 0);
@@ skipping 10 matching lines @@
   } else if (mac_window_) {
     SelectWindow(mac_window_);
   }
 }
 
 void PluginObject::FullscreenIdle() {
   if ((mac_fullscreen_overlay_window_ != NULL) &&
       (time_to_hide_overlay_ != 0.0) &&
       (time_to_hide_overlay_ < [NSDate timeIntervalSinceReferenceDate])) {
     time_to_hide_overlay_ = 0.0;
-    SlideWindowToRect(mac_fullscreen_overlay_window_,
-                      Rect2CGRect(GetOverlayWindowRect(false)),
-                      kTransitionTime);
+    o3d::SlideWindowToRect(mac_fullscreen_overlay_window_,
+                           o3d::Rect2CGRect(o3d::GetOverlayWindowRect(false)),
+                           kTransitionTime);
   }
 }
 
+}  // namespace o3d