4 files changed, 15 insertions, 13 deletions
diff --git a/chrome/browser/chromeos/login/message_bubble.cc b/chrome/browser/chromeos/login/message_bubble.cc
index b0240ce..a7f76e3 100644
--- a/chrome/browser/chromeos/login/message_bubble.cc
+++ b/chrome/browser/chromeos/login/message_bubble.cc
@@ -145,9 +145,9 @@ void MessageBubble::IsActiveChanged() {
   }
 }
 
-void MessageBubble::DoGrab() {
+void MessageBubble::SetNativeCapture() {
   if (grab_enabled_)
-    WidgetGtk::DoGrab();
+    WidgetGtk::SetNativeCapture();
 }
 
 void MessageBubble::Close() {
diff --git a/chrome/browser/chromeos/login/message_bubble.h b/chrome/browser/chromeos/login/message_bubble.h
index 6ef33bc..c2dee1e 100644
--- a/chrome/browser/chromeos/login/message_bubble.h
+++ b/chrome/browser/chromeos/login/message_bubble.h
@@ -54,7 +54,7 @@ class MessageBubble : public InfoBubble,
                                    MessageBubbleDelegate* delegate);
 
   // Overridden from WidgetGtk.
-  virtual void Close();
+  virtual void Close() OVERRIDE;
 
   virtual gboolean OnButtonPress(GtkWidget* widget, GdkEventButton* event) {
     WidgetGtk::OnButtonPress(widget, event);
@@ -72,7 +72,7 @@ class MessageBubble : public InfoBubble,
 
   // Overridden from WidgetGtk.
   virtual void IsActiveChanged();
-  virtual void DoGrab();
+  virtual void SetNativeCapture();
 
  private:
   MessageBubble(views::WidgetGtk::Type type,
diff --git a/chrome/browser/chromeos/views/webui_menu_widget.cc b/chrome/browser/chromeos/views/webui_menu_widget.cc
index cfc7c2d..78dcc9e 100644
--- a/chrome/browser/chromeos/views/webui_menu_widget.cc
+++ b/chrome/browser/chromeos/views/webui_menu_widget.cc
@@ -150,7 +150,7 @@ void WebUIMenuWidget::Init(gfx::NativeView parent, const gfx::Rect& bounds) {
 }
 
 void WebUIMenuWidget::Hide() {
-  ReleaseGrab();
+  ReleaseNativeCapture();
   WidgetGtk::Hide();
   // Clears the content.
   ExecuteJavascript(L"updateModel({'items':[]})");
@@ -168,8 +168,8 @@ void WebUIMenuWidget::Close() {
   views::WidgetGtk::Close();
 }
 
-void WebUIMenuWidget::ReleaseGrab() {
-  WidgetGtk::ReleaseGrab();
+void WebUIMenuWidget::ReleaseNativeCapture() {
+  WidgetGtk::ReleaseNativeCapture();
   if (did_input_grab_) {
     did_input_grab_ = false;
     gdk_pointer_ungrab(GDK_CURRENT_TIME);
diff --git a/chrome/browser/chromeos/views/webui_menu_widget.h b/chrome/browser/chromeos/views/webui_menu_widget.h
index a566920..b4d3352 100644
--- a/chrome/browser/chromeos/views/webui_menu_widget.h
+++ b/chrome/browser/chromeos/views/webui_menu_widget.h
@@ -27,12 +27,14 @@ class WebUIMenuWidget : public views::WidgetGtk {
   virtual ~WebUIMenuWidget();
 
   // WidgetGtk overrides:
-  virtual void Init(gfx::NativeView parent, const gfx::Rect& bounds);
-  virtual void Hide();
-  virtual void Close();
-  virtual void ReleaseGrab();
-  virtual gboolean OnGrabBrokeEvent(GtkWidget* widget, GdkEvent* event);
-  virtual void OnSizeAllocate(GtkWidget* widget, GtkAllocation* allocation);
+  virtual void Init(gfx::NativeView parent, const gfx::Rect& bounds) OVERRIDE;
+  virtual void Hide() OVERRIDE;
+  virtual void Close() OVERRIDE;
+  virtual void ReleaseNativeCapture() OVERRIDE;
+  virtual gboolean OnGrabBrokeEvent(GtkWidget* widget, GdkEvent* event)
+      OVERRIDE;
+  virtual void OnSizeAllocate(GtkWidget* widget, GtkAllocation* allocation)
+      OVERRIDE;
 
   // Returns NativeMenuWebUI that owns this widget.
   NativeMenuWebUI* webui_menu() const {