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 /ash/focus_cycler_unittest.cc | |
| 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 'ash/focus_cycler_unittest.cc')
| -rw-r--r-- | ash/focus_cycler_unittest.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index 15d4357..39c53a1 100644 --- a/ash/focus_cycler_unittest.cc +++ b/ash/focus_cycler_unittest.cc @@ -7,7 +7,6 @@ #include "ash/launcher/launcher.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" -#include "ash/status_area/status_area_view.h" #include "ash/wm/window_util.h" #include "ash/test/ash_test_base.h" #include "ash/shell_factory.h" @@ -48,8 +47,6 @@ TEST_F(FocusCyclerTest, CycleFocusForward) { views::Widget* status_widget = internal::CreateStatusArea(NULL); ASSERT_TRUE(status_widget); focus_cycler->AddWidget(status_widget); - static_cast<internal::StatusAreaView*>(status_widget->GetContentsView())-> - SetFocusCyclerForTesting(focus_cycler.get()); // Add a mock button to the status area. status_widget->GetContentsView()->AddChildView( @@ -91,8 +88,6 @@ TEST_F(FocusCyclerTest, CycleFocusBackward) { views::Widget* status_widget = internal::CreateStatusArea(NULL); ASSERT_TRUE(status_widget); focus_cycler->AddWidget(status_widget); - static_cast<internal::StatusAreaView*>(status_widget->GetContentsView())-> - SetFocusCyclerForTesting(focus_cycler.get()); // Add a mock button to the status area. status_widget->GetContentsView()->AddChildView( |