Roll Chrome into Mojo.

ui/gl/gl_surface_glx.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_GL_GL_SURFACE_GLX_H_
 #define UI_GL_GL_SURFACE_GLX_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/size.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/gl/gl_export.h"
 #include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
 // Base class for GLX surfaces.
 class GL_EXPORT GLSurfaceGLX : public GLSurface {
  public:
@@ skipping 89 matching lines @@
   gfx::Size size_;
   void* config_;
   XID pbuffer_;
 
   DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GL_GL_SURFACE_GLX_H_