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

2 files changed, 1 insertions, 24 deletions

diff --git a/ash/status_area/status_area_view.cc b/ash/status_area/status_area_view.cc
index 62b327b..fc4a8e0 100644
--- a/ash/status_area/status_area_view.cc
+++ b/ash/status_area/status_area_view.cc
@@ -5,7 +5,6 @@
 #include "ash/status_area/status_area_view.h"
 
 #include "ash/ash_export.h"
-#include "ash/focus_cycler.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/utf_string_conversions.h"
@@ -21,16 +20,11 @@ namespace internal {
 
 StatusAreaView::StatusAreaView()
     : status_mock_(*ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-          IDR_AURA_STATUS_MOCK).ToSkBitmap()),
-      focus_cycler_for_testing_(NULL) {
+          IDR_AURA_STATUS_MOCK).ToSkBitmap()) {
 }
 StatusAreaView::~StatusAreaView() {
 }
 
-void StatusAreaView::SetFocusCyclerForTesting(const FocusCycler* focus_cycler) {
-  focus_cycler_for_testing_ = focus_cycler;
-}
-
 gfx::Size StatusAreaView::GetPreferredSize() {
   return gfx::Size(status_mock_.width(), status_mock_.height());
 }
@@ -43,14 +37,6 @@ const views::Widget* StatusAreaView::GetWidget() const {
   return View::GetWidget();
 }
 
-bool StatusAreaView::CanActivate() const {
-  // We don't want mouse clicks to activate us, but we need to allow
-  // activation when the user is using the keyboard (FocusCycler).
-  const FocusCycler* focus_cycler = focus_cycler_for_testing_ ?
-      focus_cycler_for_testing_ : Shell::GetInstance()->focus_cycler();
-  return focus_cycler->widget_activating() == GetWidget();
-}
-
 void StatusAreaView::OnPaint(gfx::Canvas* canvas) {
   canvas->DrawBitmapInt(status_mock_, 0, 0);
 }
diff --git a/ash/status_area/status_area_view.h b/ash/status_area/status_area_view.h
index 808508f..32d9f37 100644
--- a/ash/status_area/status_area_view.h
+++ b/ash/status_area/status_area_view.h
@@ -13,30 +13,21 @@
 namespace ash {
 namespace internal {
 
-class FocusCycler;
-
 class StatusAreaView : public views::WidgetDelegate,
                        public views::AccessiblePaneView {
  public:
   StatusAreaView();
   virtual ~StatusAreaView();
 
-  // Sets the focus cycler.
-  void SetFocusCyclerForTesting(const FocusCycler* focus_cycler);
-
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
 
-  // views::WidgetDelegate overrides:
-  virtual bool CanActivate() const OVERRIDE;
-
  private:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
   SkBitmap status_mock_;
-  const FocusCycler* focus_cycler_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(StatusAreaView);
 };