diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 23:53:45 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 23:53:45 +0000 |
| commit | 883ce2fa8fc0b8f8bf15fb4279ea2464a22cc052 (patch) | |
| tree | 4eb19bb2c187ba53924b13a0e90d61c669a15c83 /chrome/browser/chromeos/frame/panel_browser_view.cc | |
| parent | e042db5288480d9ca61b155d8b8fa9ea42481554 (diff) | |
| download | chromium_src-883ce2fa8fc0b8f8bf15fb4279ea2464a22cc052.zip chromium_src-883ce2fa8fc0b8f8bf15fb4279ea2464a22cc052.tar.gz chromium_src-883ce2fa8fc0b8f8bf15fb4279ea2464a22cc052.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/chromeos/frame/panel_browser_view.cc')
| -rw-r--r-- | chrome/browser/chromeos/frame/panel_browser_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/frame/panel_browser_view.cc b/chrome/browser/chromeos/frame/panel_browser_view.cc index 657039e..9a601f9 100644 --- a/chrome/browser/chromeos/frame/panel_browser_view.cc +++ b/chrome/browser/chromeos/frame/panel_browser_view.cc @@ -96,8 +96,8 @@ bool PanelBrowserView::GetSavedWindowBounds(gfx::Rect* bounds) const { return res; } -void PanelBrowserView::OnWindowActivate(bool active) { - ::BrowserView::OnWindowActivate(active); +void PanelBrowserView::OnWindowActivationChanged(bool active) { + ::BrowserView::OnWindowActivationChanged(active); if (panel_controller_.get()) { if (active) panel_controller_->OnFocusIn(); |