Rename InActiveChagned to OnActiveChanged to follow standard naming scheme.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7384017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92769 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 12 insertions, 12 deletions

diff --git a/chrome/browser/chromeos/login/message_bubble.cc b/chrome/browser/chromeos/login/message_bubble.cc
index 305d10b..76b2812 100644
--- a/chrome/browser/chromeos/login/message_bubble.cc
+++ b/chrome/browser/chromeos/login/message_bubble.cc
@@ -171,7 +171,7 @@ MessageBubble* MessageBubble::ShowNoGrab(
   return bubble;
 }
 
-void MessageBubble::IsActiveChanged() {
+void MessageBubble::OnActiveChanged() {
   if (parent_ && IsActive()) {
     // Show the parent.
     gtk_window_present_with_time(parent_->GetNativeWindow(),
diff --git a/chrome/browser/chromeos/login/message_bubble.h b/chrome/browser/chromeos/login/message_bubble.h
index c3dfa75..d0a47c7 100644
--- a/chrome/browser/chromeos/login/message_bubble.h
+++ b/chrome/browser/chromeos/login/message_bubble.h
@@ -86,8 +86,8 @@ class MessageBubble : public Bubble,
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
   // Overridden from NativeWidgetGtk.
-  virtual void IsActiveChanged();
-  virtual void SetMouseCapture();
+  virtual void OnActiveChanged() OVERRIDE;
+  virtual void SetMouseCapture() OVERRIDE;
 
  private:
   MessageBubble(views::Widget::InitParams::Type type,
diff --git a/chrome/browser/ui/views/browser_bubble_gtk.cc b/chrome/browser/ui/views/browser_bubble_gtk.cc
index dfd0506..c51276b 100644
--- a/chrome/browser/ui/views/browser_bubble_gtk.cc
+++ b/chrome/browser/ui/views/browser_bubble_gtk.cc
@@ -35,7 +35,7 @@ class BubbleWidget : public views::NativeWidgetGtk {
     views::NativeWidgetGtk::Show();
   }
 
-  virtual void Close() {
+  virtual void Close() OVERRIDE {
     if (!bubble_)
       return;  // We have already been closed.
     if (IsActive()) {
@@ -47,7 +47,7 @@ class BubbleWidget : public views::NativeWidgetGtk {
     bubble_ = NULL;
   }
 
-  virtual void Hide() {
+  virtual void Hide() OVERRIDE {
     if (IsActive() && bubble_) {
       BrowserBubble::Delegate* delegate = bubble_->delegate();
       if (delegate)
@@ -56,7 +56,7 @@ class BubbleWidget : public views::NativeWidgetGtk {
     views::NativeWidgetGtk::Hide();
   }
 
-  virtual void IsActiveChanged() {
+  virtual void OnActiveChanged() OVERRIDE {
     if (IsActive() || !bubble_)
       return;
     BrowserBubble::Delegate* delegate = bubble_->delegate();
@@ -72,7 +72,7 @@ class BubbleWidget : public views::NativeWidgetGtk {
     delegate->BubbleLostFocus(bubble_, false);
   }
 
-  virtual gboolean OnFocusIn(GtkWidget* widget, GdkEventFocus* event) {
+  virtual gboolean OnFocusIn(GtkWidget* widget, GdkEventFocus* event) OVERRIDE {
     if (bubble_ && bubble_->delegate())
       bubble_->delegate()->BubbleGotFocus(bubble_);
     return views::NativeWidgetGtk::OnFocusIn(widget, event);
diff --git a/chrome/browser/ui/views/bubble/bubble.cc b/chrome/browser/ui/views/bubble/bubble.cc
index 02b2cdf7..4490c6b 100644
--- a/chrome/browser/ui/views/bubble/bubble.cc
+++ b/chrome/browser/ui/views/bubble/bubble.cc
@@ -339,7 +339,7 @@ void Bubble::OnActivate(UINT action, BOOL minimized, HWND window) {
   }
 }
 #elif defined(TOOLKIT_USES_GTK)
-void Bubble::IsActiveChanged() {
+void Bubble::OnActiveChanged() {
   if (!GetWidget()->IsActive())
     GetWidget()->Close();
 }
diff --git a/chrome/browser/ui/views/bubble/bubble.h b/chrome/browser/ui/views/bubble/bubble.h
index c79430d..5bb6b28 100644
--- a/chrome/browser/ui/views/bubble/bubble.h
+++ b/chrome/browser/ui/views/bubble/bubble.h
@@ -161,7 +161,7 @@ class Bubble
   virtual void OnActivate(UINT action, BOOL minimized, HWND window);
 #elif defined(TOOLKIT_USES_GTK)
   // Overridden from NativeWidgetGtk:
-  virtual void IsActiveChanged();
+  virtual void OnActiveChanged() OVERRIDE;
 #endif
 
 #if defined(OS_WIN)
diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc
index 887383f..38d6a6d 100644
--- a/views/widget/native_widget_gtk.cc
+++ b/views/widget/native_widget_gtk.cc
@@ -519,7 +519,7 @@ void NativeWidgetGtk::DoDrag(const OSExchangeData& data, int operation) {
   }
 }
 
-void NativeWidgetGtk::IsActiveChanged() {
+void NativeWidgetGtk::OnActiveChanged() {
   delegate_->OnNativeWidgetActivationChanged(IsActive());
 }
 
@@ -561,7 +561,7 @@ void NativeWidgetGtk::ActiveWindowChanged(GdkWindow* active_window) {
              widget_));
   }
   if (was_active != IsActive()) {
-    IsActiveChanged();
+    OnActiveChanged();
     GetWidget()->GetRootView()->SchedulePaint();
   }
 }
diff --git a/views/widget/native_widget_gtk.h b/views/widget/native_widget_gtk.h
index 951bcac..bca6c24 100644
--- a/views/widget/native_widget_gtk.h
+++ b/views/widget/native_widget_gtk.h
@@ -92,7 +92,7 @@ class NativeWidgetGtk : public internal::NativeWidgetPrivate,
   void DoDrag(const OSExchangeData& data, int operation);
 
   // Invoked when the active status changes.
-  virtual void IsActiveChanged();
+  virtual void OnActiveChanged();
 
   // Sets the drop target to NULL. This is invoked by DropTargetGTK when the
   // drop is done.