Change namespace from ui to gfx for NativePixmap related code

ui/ozone/generate_constructor_list.py

Index: ui/ozone/generate_constructor_list.py
diff --git a/ui/ozone/generate_constructor_list.py b/ui/ozone/generate_constructor_list.py
index 02945b3b986cc3e63553346f34fd23fe61b88890..87aa8a5b0040d7cfc3d3b1a975ac17db403e5691 100755
--- a/ui/ozone/generate_constructor_list.py
+++ b/ui/ozone/generate_constructor_list.py
@@ -72,7 +72,7 @@ def GetConstructorName(typename, platform):
 
 
 def GenerateConstructorList(out, namespace, export, typenames, platforms,
-                            includes):
+                            includes, usings):
   """Generate static array containing a list of constructors."""
 
   out.write('// DO NOT MODIFY. GENERATED BY generate_constructor_list.py\n')
@@ -85,6 +85,10 @@ def GenerateConstructorList(out, namespace, export, typenames, platforms,
     out.write('#include %(include)s\n' % {'include': include})
   out.write('\n')
 
+  for using in usings:
+    out.write('using %(using)s;\n' % {'using': using})
+  out.write('\n')
+
   out.write('namespace %(namespace)s {\n' % {'namespace': namespace})
   out.write('\n')
 
@@ -106,7 +110,7 @@ def GenerateConstructorList(out, namespace, export, typenames, platforms,
   # Handy typedefs for constructor types.
   for typename in typenames:
     out.write('typedef %(typename)s* (*%(typedef)s)();\n'
-              % {'typename': namespace + '::' + typename,
+              % {'typename': typename,
                  'typedef': GetTypedefName(typename)})
   out.write('\n')
 
@@ -115,7 +119,7 @@ def GenerateConstructorList(out, namespace, export, typenames, platforms,
     out.write('template <> const %(typedef)s\n'
               % {'typedef': GetTypedefName(typename)})
     out.write('PlatformConstructorList<%(typename)s>::kConstructors[] = {\n'
-              % {'typename': namespace + '::' + typename})
+              % {'typename': typename})
     for platform in platforms:
       constructor = GetConstructorName(typename, platform)
       out.write('  &%(namespace)s::%(constructor)s,\n'
@@ -126,7 +130,7 @@ def GenerateConstructorList(out, namespace, export, typenames, platforms,
   # Exported template instantiation.
   for typename in typenames:
     out.write('template class %(export)s PlatformObject<%(typename)s>;\n'
-              % {'export': export, 'typename': namespace + '::' + typename})
+              % {'export': export, 'typename': typename})
   out.write('\n')
 
   out.write('}  // namespace ui\n')
@@ -142,11 +146,13 @@ def main(argv):
   parser.add_option('--include', action='append', default=[])
   parser.add_option('--platform', action='append', default=[])
   parser.add_option('--typename', action='append', default=[])
+  parser.add_option('--using', action='append', default=[])
   options, _ = parser.parse_args(argv)
 
   platforms = list(options.platform)
   typenames = list(options.typename)
   includes = list(options.include)
+  usings = list(options.using)
 
   if options.platform_list:
     platforms = open(options.platform_list, 'r').read().strip().split('\n')
@@ -161,7 +167,7 @@ def main(argv):
     out_cc = open(options.output_cc, 'wb')
 
   GenerateConstructorList(out_cc, options.namespace, options.export,
-                          typenames, platforms, includes)
+                          typenames, platforms, includes, usings)
 
   if options.output_cc:
     out_cc.close()