Move ui::gfx::Image out of the ui namespace to be just gfx::Image.

ui/gfx/image.cc

 // Copyright (c) 2011 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 "ui/gfx/image.h"
 
 #include "base/logging.h"
 
 #if defined(OS_LINUX)
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib-object.h>
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/gtk_util.h"
 #elif defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "skia/ext/skia_utils_mac.h"
 #endif
 
-namespace ui {
 namespace gfx {
 
 namespace internal {
 
 #if defined(OS_MACOSX)
 // This is a wrapper around gfx::NSImageToSkBitmap() because this cross-platform
 // file cannot include the [square brackets] of ObjC.
 const SkBitmap* NSImageToSkBitmap(NSImage* image);
 #endif
 
 #if defined(OS_LINUX)
 const SkBitmap* GdkPixbufToSkBitmap(GdkPixbuf* pixbuf) {
-  ::gfx::CanvasSkia canvas(gdk_pixbuf_get_width(pixbuf),
-                           gdk_pixbuf_get_height(pixbuf),
+  gfx::CanvasSkia canvas(gdk_pixbuf_get_width(pixbuf),
+                         gdk_pixbuf_get_height(pixbuf),
                            false);
   canvas.DrawGdkPixbuf(pixbuf, 0, 0);
   return new SkBitmap(canvas.ExtractBitmap());
 }
 #endif
 
 class SkBitmapRep;
 class GdkPixbufRep;
 class NSImageRep;
 
@@ skipping 201 matching lines @@
     }
     NOTREACHED();
   }
 
   // Handle Skia-to-native conversions.
   if (default_rep->type() == Image::kSkBitmapRep) {
     internal::SkBitmapRep* skia_rep = default_rep->AsSkBitmapRep();
     internal::ImageRep* native_rep = NULL;
 #if defined(OS_LINUX)
     if (rep_type == Image::kGdkPixbufRep) {
-      GdkPixbuf* pixbuf = ::gfx::GdkPixbufFromSkBitmap(skia_rep->bitmap());
+      GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(skia_rep->bitmap());
       native_rep = new internal::GdkPixbufRep(pixbuf);
     }
 #elif defined(OS_MACOSX)
     if (rep_type == Image::kNSImageRep) {
-      NSImage* image = ::gfx::SkBitmapToNSImage(*(skia_rep->bitmap()));
+      NSImage* image = gfx::SkBitmapToNSImage(*(skia_rep->bitmap()));
       base::mac::NSObjectRetain(image);
       native_rep = new internal::NSImageRep(image);
     }
 #endif
     if (native_rep) {
       AddRepresentation(native_rep);
       return native_rep;
     }
     NOTREACHED();
   }
 
   // Something went seriously wrong...
   return NULL;
 }
 
 void Image::AddRepresentation(internal::ImageRep* rep) {
   representations_.insert(std::make_pair(rep->type(), rep));
 }
 
 }  // namespace gfx
-}  // namespace ui