From 57f360233af2f9d75a2a3fe8204275ab44b4388d Mon Sep 17 00:00:00 2001
From: "ben@chromium.org"
 <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 15 Mar 2011 00:03:26 +0000
Subject: These files missed the last checkin

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78131 0039d316-1c4b-4281-b951-d872f2087c98
---
 views/widget/widget_gtk.cc |  2 +-
 views/window/window_gtk.cc | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index d60a0c9..3ebd950 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -423,7 +423,7 @@ void WidgetGtk::DoDrag(const OSExchangeData& data, int operation) {
 
 void WidgetGtk::IsActiveChanged() {
   if (widget_delegate())
-    widget_delegate()->IsActiveChanged(IsActive());
+    widget_delegate()->OnWidgetActivated(IsActive());
 }
 
 void WidgetGtk::ResetDropTarget() {
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index 28bbd6c..46af221 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -233,6 +233,14 @@ void WindowGtk::SetInitialFocus() {
 ////////////////////////////////////////////////////////////////////////////////
 // WindowGtk, NativeWindow implementation:
 
+NativeWidget* WindowGtk::AsNativeWidget() {
+  return this;
+}
+
+const NativeWidget* WindowGtk::AsNativeWidget() const {
+  return this;
+}
+
 gfx::Rect WindowGtk::GetRestoredBounds() const {
   // We currently don't support tiling, so this doesn't matter.
   return GetWindowScreenBounds();
@@ -297,14 +305,6 @@ void WindowGtk::SetAccessibleRole(ui::AccessibilityTypes::Role role) {
 void WindowGtk::SetAccessibleState(ui::AccessibilityTypes::State state) {
 }
 
-NativeWidget* WindowGtk::AsNativeWidget() {
-  return this;
-}
-
-const NativeWidget* WindowGtk::AsNativeWidget() const {
-  return this;
-}
-
 Window* WindowGtk::GetWindow() {
   return this;
 }
-- 
cgit v1.1