diff options
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r-- | chrome/browser/chromeos/frame/panel_browser_view.cc | 20 | ||||
-rw-r--r-- | chrome/browser/chromeos/frame/panel_browser_view.h | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/chromeos/frame/panel_browser_view.cc b/chrome/browser/chromeos/frame/panel_browser_view.cc index 0a4e8b5..657039e 100644 --- a/chrome/browser/chromeos/frame/panel_browser_view.cc +++ b/chrome/browser/chromeos/frame/panel_browser_view.cc @@ -83,16 +83,6 @@ void PanelBrowserView::UpdateTitleBar() { panel_controller_->UpdateTitleBar(); } -void PanelBrowserView::ActivationChanged(bool activated) { - ::BrowserView::ActivationChanged(activated); - if (panel_controller_.get()) { - if (activated) - panel_controller_->OnFocusIn(); - else - panel_controller_->OnFocusOut(); - } -} - void PanelBrowserView::SetCreatorView(PanelBrowserView* creator) { DCHECK(creator); GtkWindow* window = creator->GetNativeHandle(); @@ -106,6 +96,16 @@ bool PanelBrowserView::GetSavedWindowBounds(gfx::Rect* bounds) const { return res; } +void PanelBrowserView::OnWindowActivate(bool active) { + ::BrowserView::OnWindowActivate(active); + if (panel_controller_.get()) { + if (active) + panel_controller_->OnFocusIn(); + else + panel_controller_->OnFocusOut(); + } +} + //////////////////////////////////////////////////////////////////////////////// // PanelController::Delegate overrides. diff --git a/chrome/browser/chromeos/frame/panel_browser_view.h b/chrome/browser/chromeos/frame/panel_browser_view.h index 822d9d1..cb51c3e 100644 --- a/chrome/browser/chromeos/frame/panel_browser_view.h +++ b/chrome/browser/chromeos/frame/panel_browser_view.h @@ -30,9 +30,9 @@ class PanelBrowserView : public ::BrowserView, virtual void SetBounds(const gfx::Rect& bounds); virtual void Close(); virtual void UpdateTitleBar(); - virtual void ActivationChanged(bool activated); virtual void SetCreatorView(PanelBrowserView* creator); virtual bool GetSavedWindowBounds(gfx::Rect* bounds) const; + virtual void OnWindowActivate(bool active); // PanelController::Delegate overrides virtual string16 GetPanelTitle(); |