Reland 78062 with some NULL checks.

Revert 78062 - Migrate more of BrowserFrame's event handling down into WindowWin/WidgetWin and their delegate interfaces. BUG=72040 TEST=none Review URL: http://codereview.chromium.org/6683007 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/6686059


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

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

1 files changed, 13 insertions, 8 deletions

diff --git a/views/widget/widget_delegate.h b/views/widget/widget_delegate.h
index 71ea6ee..b37c391 100644
--- a/views/widget/widget_delegate.h
+++ b/views/widget/widget_delegate.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -14,15 +14,20 @@ class WidgetDelegate {
  public:
   virtual ~WidgetDelegate() {}
 
-  // Called with the display changes (color depth or resolution).
-  virtual void DisplayChanged() {}
+  // Called whenever the widget is activated or deactivated.
+  // TODO(beng): This should be consolidated with
+  //             WindowDelegate::OnWindowActivationChanged().
+  virtual void OnWidgetActivated(bool active) {}
+
+  // Called whenever the widget's position changes.
+  virtual void OnWidgetMove() {}
 
-  // Called when widget active state has changed.
-  virtual void IsActiveChanged(bool active) {}
+  // Called with the display changes (color depth or resolution).
+  virtual void OnDisplayChanged() {}
 
-  // Called when the work area (the desktop area minus taskbars,
-  // menubars, etc.) changes in size.
-  virtual void WorkAreaChanged() {}
+  // Called when the work area (the desktop area minus task bars,
+  // menu bars, etc.) changes in size.
+  virtual void OnWorkAreaChanged() {}
 };
 
 }  // namespace views