diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 09:13:34 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 09:13:34 +0000 |
| commit | 2d5115433d38fa4f1e70cb7f3164cdb4d26624e2 (patch) | |
| tree | 6e4ef250b395c77066db1dc83c47b081f5abb0b7 /ash/focus_cycler_unittest.cc | |
| parent | 44540c2bf35120dd3486898ea43ce5cc9fc6089f (diff) | |
| download | chromium_src-2d5115433d38fa4f1e70cb7f3164cdb4d26624e2.zip chromium_src-2d5115433d38fa4f1e70cb7f3164cdb4d26624e2.tar.gz chromium_src-2d5115433d38fa4f1e70cb7f3164cdb4d26624e2.tar.bz2 | |
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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=125323
Review URL: https://chromiumcodereview.appspot.com/9570013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/focus_cycler_unittest.cc')
| -rw-r--r-- | ash/focus_cycler_unittest.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index 39c53a1..7380463 100644 --- a/ash/focus_cycler_unittest.cc +++ b/ash/focus_cycler_unittest.cc @@ -7,6 +7,7 @@ #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" @@ -47,6 +48,8 @@ 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( @@ -88,6 +91,8 @@ 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( @@ -160,6 +165,8 @@ TEST_F(FocusCyclerLauncherTest, CycleFocusForwardInvisible) { 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( @@ -197,6 +204,8 @@ TEST_F(FocusCyclerLauncherTest, CycleFocusBackwardInvisible) { 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( |