Renaming Window to WindowBase and LocalWindow to Window.

sdk/lib/html/scripts/htmlrenamer.py

Index: sdk/lib/html/scripts/htmlrenamer.py
diff --git a/sdk/lib/html/scripts/htmlrenamer.py b/sdk/lib/html/scripts/htmlrenamer.py
index 46ca30a58b298078dba68ba7f367da69f70698f8..df133c0abf0834d425c109dffb52323e68ed3b59 100644
--- a/sdk/lib/html/scripts/htmlrenamer.py
+++ b/sdk/lib/html/scripts/htmlrenamer.py
@@ -12,12 +12,10 @@ html_interface_renames = {
     'DOMFileSystemSync': 'FileSystemSync',
     'DOMFormData': 'FormData',
     'DOMURL': 'Url',
-    'DOMWindow': 'LocalWindow',
-    'History': 'LocalHistory',
+    'DOMWindow': 'Window',
     'HTMLDocument' : 'HtmlDocument',
     'IDBAny': '_Any', # Suppressed, but needs to exist for Dartium.
     'IDBFactory': 'IdbFactory', # Manual to avoid name conflicts.
-    'Location': 'LocalLocation',
     'SVGDocument': 'SvgDocument', # Manual to avoid name conflicts.
     'SVGElement': 'SvgElement', # Manual to avoid name conflicts.
     'SVGException': 'SvgException', # Manual of avoid conflict with Exception.
@@ -110,7 +108,7 @@ _private_html_members = set([
   'EventTarget.removeEventListener',
   'KeyboardEvent.keyIdentifier',
   'KeyboardEvent.initKeyboardEvent',
-  'LocalWindow.getComputedStyle',
+  'Window.getComputedStyle',

[sra1, 2012/12/20 02:19:18]

Move to keep sorted.

[Emily Fortuna, 2012/12/20 18:26:23]

+1

   'MouseEvent.initMouseEvent',
   'Node.appendChild',
   'Node.attributes',
@@ -321,14 +319,14 @@ _removed_html_members = set([
     "Node.lookupPrefix",
     "Node.get:PROCESSING_INSTRUCTION_NODE",
     'ShadowRoot.getElementsByTagNameNS',
-    "LocalWindow.blur",
-    "LocalWindow.clientInformation",
-    "LocalWindow.get:frames",
-    "LocalWindow.get:length",
-    "LocalWindow.focus",
-    "LocalWindow.prompt",
-    "LocalWindow.webkitIndexedDB",
-    "LocalWindow.webkitCancelRequestAnimationFrame",
+    "Window.blur",
+    "Window.clientInformation",
+    "Window.get:frames",
+    "Window.get:length",
+    "Window.focus",
+    "Window.prompt",
+    "Window.webkitIndexedDB",
+    "Window.webkitCancelRequestAnimationFrame",
     "WheelEvent.wheelDelta",
     "WorkerContext.webkitIndexedDB",
     ])