diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 05:57:17 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 05:57:17 +0000 |
| commit | 7dfde8105d31433d7bb860c1a68c09404298d996 (patch) | |
| tree | a017009cb1d0def2d2986bde3aede53551ff9600 /chrome/browser/ui | |
| parent | 5b352caa4728bb2aefb6b6c64067678251d2fc97 (diff) | |
| download | chromium_src-7dfde8105d31433d7bb860c1a68c09404298d996.zip chromium_src-7dfde8105d31433d7bb860c1a68c09404298d996.tar.gz chromium_src-7dfde8105d31433d7bb860c1a68c09404298d996.tar.bz2 | |
Revert 125323 - Activate the status area only when it's focused using the keyboard.
ash/status_area/status_area_view.cc:
chrome/browser/chromeos/status/status_area_view.cc:
Override views::WidgetDelegate::CanActivate. Return false unless the area is focused using the keyboard.
ash/system/tray/system_tray.cc:
Handle a mouse event correctly.
ash/wm/activation_controller.cc:
Change the order of kWindowContainerIds[] so that a browser window gets focused when a window in SettingBubbleContainer is closed.
This fix is similar to http://crrev.com/122459 (by sky).
BUG=115815
TEST=aura_shell_unittests
Review URL: http://codereview.chromium.org/9570013
TBR=yusukes@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9615051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/views/ash/status_area_host_aura.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/ash/status_area_host_aura.cc b/chrome/browser/ui/views/ash/status_area_host_aura.cc index a9728ba..e02f3be 100644 --- a/chrome/browser/ui/views/ash/status_area_host_aura.cc +++ b/chrome/browser/ui/views/ash/status_area_host_aura.cc @@ -105,7 +105,6 @@ views::Widget* StatusAreaHostAura::CreateStatusArea() { views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); gfx::Size ps = status_area_view_->GetPreferredSize(); params.bounds = gfx::Rect(0, 0, ps.width(), ps.height()); - params.delegate = status_area_view_; params.parent = status_window; params.transparent = true; status_area_widget_->Init(params); |