Auto open and close the palette on an eject event.

ash/common/system/chromeos/palette/palette_tray.cc

 // Copyright 2016 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/common/system/chromeos/palette/palette_tray.h"
 
+#include "ash/common/palette_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/system/chromeos/palette/eject_controller.h"
 #include "ash/common/system/chromeos/palette/palette_tool_manager.h"
 #include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_bubble_wrapper.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
@@ skipping 90 matching lines @@
   PaletteTray* palette_tray_;
 
   DISALLOW_COPY_AND_ASSIGN(TitleView);
 };
 
 }  // namespace
 
 PaletteTray::PaletteTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf),
       palette_tool_manager_(new PaletteToolManager(this)) {
+  eject_controller_.reset(new EjectController(
+      base::Bind(&PaletteTray::OnEject, base::Unretained(this))));
+
   PaletteTool::RegisterToolInstances(palette_tool_manager_.get());
 
   SetContentsBackground();
 
   SetLayoutManager(new views::FillLayout());
   icon_ = new views::ImageView();
   UpdateTrayIcon();
 
   SetIconBorderForShelfAlignment();
   tray_container()->AddChildView(icon_);
@@ skipping 127 matching lines @@
       ->GetWindowForWidget(anchor_widget)
       ->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(
           bubble_widget, kShellWindowId_SettingBubbleContainer, params);
 }
 
 void PaletteTray::HideBubble(const views::TrayBubbleView* bubble_view) {
   HideBubbleWithView(bubble_view);
 }
 
 void PaletteTray::HidePalette() {

[stevenjb, 2016/08/15 20:18:25]

The name of this is extra confusing, it should probably be 'HideBubble()', at
least for now.

[jdufault, 2016/08/15 21:55:04]

There's already a HideBubble(...) from views::TrayBubbleView::Delegate. The
PaletteToolManager override doesn't take a parameter, so they need different
names. :/

I'm happy to do something else if you have a good idea.

[stevenjb, 2016/08/15 22:41:29]

Oh, so there is. I didn't realize that this was a PaletteToolManager::Delegate
method. Calling it from OnEject() is confusing, especially with the OpenBubble
vs HidePalette asymetry.

Instead we should either just call bubble_.reset() directly, or create a private
method like CloseBubble or ResetBubble that we call here and in OnEject (but I
wouldn't do that unless we anticipate additional logic beyond bubble_.reset().

[jdufault, 2016/08/16 00:02:18]

I've changed all HidePalette calls to just call bubble_.reset() directly.

   bubble_.reset();
 }
 
 void PaletteTray::OnActiveToolChanged() {
   UpdateTrayIcon();
 }
 
 WmWindow* PaletteTray::GetWindow() {
   return shelf()->GetWindow();
 }
@@ skipping 22 matching lines @@
         kVerticalShelfVerticalPadding, kVerticalShelfHorizontalPadding)));
   }
 }
 
 void PaletteTray::UpdateTrayIcon() {
   gfx::VectorIconId icon = palette_tool_manager_->GetActiveTrayIcon(
       palette_tool_manager_->GetActiveTool(ash::PaletteGroup::MODE));
   icon_->SetImage(CreateVectorIcon(icon, kShelfIconColor));
 }
 
+void PaletteTray::OnEject(bool eject) {
+  if (!WmShell::Get()->palette_delegate()->ShouldAutoOpenPalette())
+    return;
+
+  if (eject && !bubble_)
+    OpenBubble();
+
+  if (!eject && bubble_)
+    HidePalette();
+}
+
 void PaletteTray::UpdateIconVisibility() {
   if (!IsPaletteEnabled())
     return;
 
   SessionStateDelegate* session_state_delegate =
       WmShell::Get()->GetSessionStateDelegate();
 
   SetVisible(!session_state_delegate->IsScreenLocked() &&
              session_state_delegate->GetSessionState() ==
                  SessionStateDelegate::SESSION_STATE_ACTIVE &&
              WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
                  LoginStatus::KIOSK_APP);
 }
 
 }  // namespace ash