11 files changed, 54 insertions, 79 deletions
diff --git a/mojo/examples/launcher/launcher.mojom b/mojo/examples/launcher/launcher.mojom
index d43692d..e4e64cb 100644
--- a/mojo/examples/launcher/launcher.mojom
+++ b/mojo/examples/launcher/launcher.mojom
@@ -6,14 +6,14 @@ module mojo {
 
 [Peer=LauncherClient]
 interface Launcher {
-  void Show();
-  void Hide();
+  Show();
+  Hide();
 };
 
 [Peer=Launcher]
 interface LauncherClient {
   // Called when the user has requested |url| be launched.
-  void OnURLEntered(string url);
+  OnURLEntered(string url);
 };
 
 }
diff --git a/mojo/examples/view_manager/view_manager.mojom b/mojo/examples/view_manager/view_manager.mojom
index cdb3c06..76947b6 100644
--- a/mojo/examples/view_manager/view_manager.mojom
+++ b/mojo/examples/view_manager/view_manager.mojom
@@ -6,23 +6,23 @@ module mojo {
 
 [Peer=ViewClient]
 interface View {
-  void SetId(int32 id);
-  void GetId();
+  SetId(int32 id);
+  GetId();
 };
 
 [Peer=View]
 interface ViewClient {
-  void OnGotId(int32 id);
+  OnGotId(int32 id);
 };
 
 [Peer=ViewManagerClient]
 interface ViewManager {
-  void CreateView();
+  CreateView();
 };
 
 [Peer=ViewManager]
 interface ViewManagerClient {
-  void OnViewCreated(View view);
+  OnViewCreated(View view);
 };
 
 }
diff --git a/mojo/public/bindings/pylib/parse/mojo_lexer.py b/mojo/public/bindings/pylib/parse/mojo_lexer.py
index 27ec0db..e5949a3 100644
--- a/mojo/public/bindings/pylib/parse/mojo_lexer.py
+++ b/mojo/public/bindings/pylib/parse/mojo_lexer.py
@@ -1,30 +1,6 @@
-# PLY based Lexer class, based on pycparser by Eli Bendersky.
-#
-# Copyright (c) 2012, Eli Bendersky
-# 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.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of Eli Bendersky nor the names of its contributors may
-#   be used to endorse or promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Copyright 2014 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.
 
 import re
 import sys
@@ -69,7 +45,6 @@ class Lexer(object):
     'STRUCT',
     'INTERFACE',
     'ENUM',
-    'VOID',
   )
 
   keyword_map = {}
diff --git a/mojo/public/bindings/pylib/parse/mojo_parser.py b/mojo/public/bindings/pylib/parse/mojo_parser.py
index 4db5cd2..7c6fcfb 100755
--- a/mojo/public/bindings/pylib/parse/mojo_parser.py
+++ b/mojo/public/bindings/pylib/parse/mojo_parser.py
@@ -131,8 +131,8 @@ class Parser(object):
       p[0] = ListFromConcat(p[1], p[2])
 
   def p_method(self, p):
-    """method : VOID NAME LPAREN parameters RPAREN ordinal SEMI"""
-    p[0] = ('METHOD', p[2], p[4], p[6])
+    """method : NAME LPAREN parameters RPAREN ordinal SEMI"""
+    p[0] = ('METHOD', p[1], p[3], p[5])
 
   def p_parameters(self, p):
     """parameters : parameter
diff --git a/mojo/public/bindings/tests/math_calculator.mojom b/mojo/public/bindings/tests/math_calculator.mojom
index 949a902..3b8cb7f 100644
--- a/mojo/public/bindings/tests/math_calculator.mojom
+++ b/mojo/public/bindings/tests/math_calculator.mojom
@@ -6,14 +6,14 @@ module math {
 
 [Peer=CalculatorUI]
 interface Calculator {
-  void Clear() @0;
-  void Add(double value @0) @1;
-  void Multiply(double value @0) @2;
+  Clear() @0;
+  Add(double value @0) @1;
+  Multiply(double value @0) @2;
 };
 
 [Peer=Calculator]
 interface CalculatorUI {
-  void Output(double value @0) @0;
+  Output(double value @0) @0;
 };
 
 }
diff --git a/mojo/public/bindings/tests/sample_factory.mojom b/mojo/public/bindings/tests/sample_factory.mojom
index 5f076df..15b771a 100644
--- a/mojo/public/bindings/tests/sample_factory.mojom
+++ b/mojo/public/bindings/tests/sample_factory.mojom
@@ -19,14 +19,14 @@ struct Response {
 
 [Peer=FactoryClient]
 interface Factory {
-  void DoStuff(Request request, handle<message_pipe> pipe);
-  void DoStuff2(handle<data_pipe_consumer> pipe);
+  DoStuff(Request request, handle<message_pipe> pipe);
+  DoStuff2(handle<data_pipe_consumer> pipe);
 };
 
 [Peer=Factory]
 interface FactoryClient {
-  void DidStuff(Response response, string text);
-  void DidStuff2(string text);
+  DidStuff(Response response, string text);
+  DidStuff2(string text);
 };
 
 }  // module sample
diff --git a/mojo/public/bindings/tests/sample_service.mojom b/mojo/public/bindings/tests/sample_service.mojom
index 7bdd171..979ec39 100644
--- a/mojo/public/bindings/tests/sample_service.mojom
+++ b/mojo/public/bindings/tests/sample_service.mojom
@@ -52,7 +52,7 @@ struct DefaultsTest {
 };
 
 interface Port {
-  void PostMessage(string message_text @0) @0;
+  PostMessage(string message_text @0) @0;
 };
 
 [Peer=ServiceClient]
@@ -61,12 +61,12 @@ interface Service {
     BAZ_REGULAR = 0,
     BAZ_EXTRA
   };
-  void Frobinate(Foo foo @0, int32 baz @1, Port port @2) @0;
+  Frobinate(Foo foo @0, int32 baz @1, Port port @2) @0;
 };
 
 [Peer=Service]
 interface ServiceClient {
-  void DidFrobinate(int32 result @0) @0;
+  DidFrobinate(int32 result @0) @0;
 };
 
 }
diff --git a/mojo/public/shell/lib/shell.mojom b/mojo/public/shell/lib/shell.mojom
index 69827da5..39eae78 100644
--- a/mojo/public/shell/lib/shell.mojom
+++ b/mojo/public/shell/lib/shell.mojom
@@ -8,12 +8,12 @@ module mojo {
 interface Shell {
   // Loads url. mojo:{service} will result in the user of the value of the
   // --origin flag to the shell being used.
-  void Connect(string url, handle<message_pipe> client_handle);
+  Connect(string url, handle<message_pipe> client_handle);
 };
 
 [Peer=Shell]
 interface ShellClient {
-  void AcceptConnection(string url, handle<message_pipe> client_handle);
+  AcceptConnection(string url, handle<message_pipe> client_handle);
 };
 
 }
diff --git a/mojo/services/gles2/command_buffer.mojom b/mojo/services/gles2/command_buffer.mojom
index e25e3a3..817b857 100644
--- a/mojo/services/gles2/command_buffer.mojom
+++ b/mojo/services/gles2/command_buffer.mojom
@@ -21,36 +21,36 @@ struct ShmHandle {
 };
 
 interface CommandBufferSyncClient {
-  void DidInitialize(bool success);
-  void DidMakeProgress(CommandBufferState state);
+  DidInitialize(bool success);
+  DidMakeProgress(CommandBufferState state);
 };
 
 [Peer=CommandBufferClient]
 interface CommandBuffer {
-  void Initialize(CommandBufferSyncClient sync_client,
+  Initialize(CommandBufferSyncClient sync_client,
                   ShmHandle shared_state);
-  void SetGetBuffer(int32 buffer);
-  void Flush(int32 put_offset);
-  void MakeProgress(int32 last_get_offset);
-  void RegisterTransferBuffer(int32 id, ShmHandle transfer_buffer, uint32 size);
-  void DestroyTransferBuffer(int32 id);
-  void Echo();
+  SetGetBuffer(int32 buffer);
+  Flush(int32 put_offset);
+  MakeProgress(int32 last_get_offset);
+  RegisterTransferBuffer(int32 id, ShmHandle transfer_buffer, uint32 size);
+  DestroyTransferBuffer(int32 id);
+  Echo();
 
   // TODO(piman): move to somewhere else (native_viewport?).
-  void RequestAnimationFrames();
-  void CancelAnimationFrames();
+  RequestAnimationFrames();
+  CancelAnimationFrames();
 
   // TODO(piman): sync points
 };
 
 [Peer=CommandBuffer]
 interface CommandBufferClient {
-  void DidDestroy();
-  void EchoAck();
-  void LostContext(int32 lost_reason);  // TODO(piman): enum
+  DidDestroy();
+  EchoAck();
+  LostContext(int32 lost_reason);  // TODO(piman): enum
 
   // TODO(piman): move to somewhere else (native_viewport?).
-  void DrawAnimationFrame();
+  DrawAnimationFrame();
 };
 
 }
diff --git a/mojo/services/native_viewport/native_viewport.mojom b/mojo/services/native_viewport/native_viewport.mojom
index f9decc5..3967aa5 100644
--- a/mojo/services/native_viewport/native_viewport.mojom
+++ b/mojo/services/native_viewport/native_viewport.mojom
@@ -39,21 +39,21 @@ struct Event {
 
 [Peer=NativeViewportClient]
 interface NativeViewport {
-  void Create(Rect bounds);
-  void Show();
-  void Hide();
-  void Close();
-  void SetBounds(Rect bounds);
-  void CreateGLES2Context(handle<message_pipe> gles2_client);
-  void AckEvent(Event event);
+  Create(Rect bounds);
+  Show();
+  Hide();
+  Close();
+  SetBounds(Rect bounds);
+  CreateGLES2Context(handle<message_pipe> gles2_client);
+  AckEvent(Event event);
 };
 
 [Peer=NativeViewport]
 interface NativeViewportClient {
-  void OnCreated();
-  void OnBoundsChanged(Rect bounds);
-  void OnDestroyed();
-  void OnEvent(Event event);
+  OnCreated();
+  OnBoundsChanged(Rect bounds);
+  OnDestroyed();
+  OnEvent(Event event);
 };
 
 }
diff --git a/mojo/shell/test.mojom b/mojo/shell/test.mojom
index 200b178..59ebfa9 100644
--- a/mojo/shell/test.mojom
+++ b/mojo/shell/test.mojom
@@ -6,12 +6,12 @@ module mojo {
 
 [Peer=TestClient]
 interface TestService {
-  void Test(string test_string);
+  Test(string test_string);
 };
 
 [Peer=TestService]
 interface TestClient {
-  void AckTest();
+  AckTest();
 };
 
 }