diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 21:08:02 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 21:08:02 +0000 |
commit | b577bd5475b1f214d0d7a2a64fa787cffd480829 (patch) | |
tree | 6fb38e2ea05d7f7e282747fa8b91b3ce8a488642 /chrome/browser/chromeos | |
parent | 320ddbe75a02d9443c6b73073e9cf907668dccd2 (diff) | |
download | chromium_src-b577bd5475b1f214d0d7a2a64fa787cffd480829.zip chromium_src-b577bd5475b1f214d0d7a2a64fa787cffd480829.tar.gz chromium_src-b577bd5475b1f214d0d7a2a64fa787cffd480829.tar.bz2 |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
5 files changed, 18 insertions, 13 deletions
diff --git a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc index f403694..2224068 100644 --- a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc +++ b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc @@ -29,6 +29,11 @@ BrowserFrameChromeos::~BrowserFrameChromeos() { } void BrowserFrameChromeos::InitBrowserFrame() { + // NOTE: This logic supersedes the logic in BrowserFrameGtk::Init() + // by always setting browser_frame_view_. + set_browser_frame_view( + browser::CreateBrowserNonClientFrameView(this, browser_view())); + BrowserFrameGtk::InitBrowserFrame(); if (!browser_view()->IsBrowserTypePopup()) { diff --git a/chrome/browser/chromeos/frame/panel_browser_view.cc b/chrome/browser/chromeos/frame/panel_browser_view.cc index 9a601f9..657039e 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::OnWindowActivationChanged(bool active) { - ::BrowserView::OnWindowActivationChanged(active); +void PanelBrowserView::OnWindowActivate(bool active) { + ::BrowserView::OnWindowActivate(active); if (panel_controller_.get()) { if (active) panel_controller_->OnFocusIn(); diff --git a/chrome/browser/chromeos/frame/panel_browser_view.h b/chrome/browser/chromeos/frame/panel_browser_view.h index eec101d..cb51c3e 100644 --- a/chrome/browser/chromeos/frame/panel_browser_view.h +++ b/chrome/browser/chromeos/frame/panel_browser_view.h @@ -32,7 +32,7 @@ class PanelBrowserView : public ::BrowserView, virtual void UpdateTitleBar(); virtual void SetCreatorView(PanelBrowserView* creator); virtual bool GetSavedWindowBounds(gfx::Rect* bounds) const; - virtual void OnWindowActivationChanged(bool active); + virtual void OnWindowActivate(bool active); // PanelController::Delegate overrides virtual string16 GetPanelTitle(); diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc index a151502..97b68ed 100644 --- a/chrome/browser/chromeos/login/user_controller.cc +++ b/chrome/browser/chromeos/login/user_controller.cc @@ -268,7 +268,7 @@ void UserController::UpdateUserCount(int index, int total_user_count) { //////////////////////////////////////////////////////////////////////////////// // UserController, WidgetDelegate implementation: // -void UserController::OnWidgetActivated(bool active) { +void UserController::IsActiveChanged(bool active) { is_user_selected_ = active; if (active) { delegate_->OnUserSelected(this); diff --git a/chrome/browser/chromeos/login/user_controller.h b/chrome/browser/chromeos/login/user_controller.h index 28250a1..bab0971 100644 --- a/chrome/browser/chromeos/login/user_controller.h +++ b/chrome/browser/chromeos/login/user_controller.h @@ -103,22 +103,22 @@ class UserController : public views::WidgetDelegate, void UpdateUserCount(int index, int total_user_count); // views::WidgetDelegate implementation: - virtual void OnWidgetActivated(bool active) OVERRIDE; + virtual void IsActiveChanged(bool active); // NewUserView::Delegate implementation: virtual void OnLogin(const std::string& username, - const std::string& password) OVERRIDE; - virtual void OnLoginAsGuest() OVERRIDE; - virtual void OnCreateAccount() OVERRIDE; - virtual void ClearErrors() OVERRIDE; - virtual void NavigateAway() OVERRIDE; + const std::string& password); + virtual void OnLoginAsGuest(); + virtual void OnCreateAccount(); + virtual void ClearErrors(); + virtual void NavigateAway(); // UserView::Delegate implementation: - virtual void OnRemoveUser() OVERRIDE; - virtual bool IsUserSelected() const OVERRIDE { return is_user_selected_; } + virtual void OnRemoveUser(); + virtual bool IsUserSelected() const { return is_user_selected_; } // UsernameView::Delegate implementation: - virtual void OnLocaleChanged() OVERRIDE; + virtual void OnLocaleChanged(); // Padding between the user windows. static const int kPadding; |