Overview Tray Button should not be visible on login screen

ash/system/overview/overview_button_tray.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/overview/overview_button_tray.h"
 
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
+#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_utils.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/image_view.h"
 
 namespace {
@@ skipping 15 matching lines @@
       icon_(NULL) {
   SetContentsBackground();
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   icon_ = new views::ImageView();
   icon_->SetImage(
       bundle.GetImageNamed(IDR_AURA_UBER_TRAY_OVERVIEW_MODE).ToImageSkia());
   SetIconBorderForShelfAlignment();
   tray_container()->AddChildView(icon_);
 
-  SetVisible(Shell::GetInstance()->IsMaximizeModeWindowManagerEnabled());
+  UpdateIconVisibility(Shell::GetInstance()->
+      IsMaximizeModeWindowManagerEnabled());
 
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 OverviewButtonTray::~OverviewButtonTray() {
   Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 bool OverviewButtonTray::PerformAction(const ui::Event& event) {
   Shell::GetInstance()->window_selector_controller()->ToggleOverview();
   return true;
 }
 
 void OverviewButtonTray::OnMaximizeModeStarted() {
-  SetVisible(true);
+  UpdateIconVisibility(/* maximize_mode_enabled */ true);

[sadrul, 2014/03/28 21:23:35]

In some parts of the code, an enum is used instead of bools so you don't need to
add comments like this.

[jonross, 2014/03/31 15:09:01]

This is only here until a refactor of MaximizeMode is done. We want everywhere
listening for maximize mode to just be able to check the state in Shell.
Currently it doesn't match. I'll add another TODO here.

 }
 
 void OverviewButtonTray::OnMaximizeModeEnded() {
-  SetVisible(false);
+  UpdateIconVisibility(/* maximize_mode_enabled */ false);
 }
 
 bool OverviewButtonTray::ClickedOutsideBubble() {
   // This class has no bubbles dismiss, but acknowledge that the message was
   // handled.
   return true;
 }
 
 base::string16 OverviewButtonTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(IDS_ASH_OVERVIEW_BUTTON_ACCESSIBLE_NAME);
@@ skipping 22 matching lines @@
         kHorizontalShelfHorizontalPadding));
   } else {
     icon_->SetBorder(views::Border::CreateEmptyBorder(
         kVerticalShelfVerticalPadding,
         kVerticalShelfHorizontalPadding,
         kVerticalShelfVerticalPadding,
         kVerticalShelfHorizontalPadding));
   }
 }
 
+void OverviewButtonTray::UpdateIconVisibility(bool maximize_mode_enabled) {
+  SetVisible(maximize_mode_enabled &&
+             Shell::GetInstance()->window_selector_controller()->CanSelect());
+}
+
+void OverviewButtonTray::UpdateAfterLoginStatusChange(
+    user::LoginStatus status) {
+  UpdateIconVisibility(Shell::GetInstance()->
+      IsMaximizeModeWindowManagerEnabled());
+}

[sadrul, 2014/03/28 21:23:35]

The function order in .cc should match the order in .h

[jonross, 2014/03/31 15:09:01]

Done.

+
 }  // namespace ash