Add LogoutConfirmationController to show LogoutConfirmationDialogs

ash/shell.cc

 // Copyright (c) 2012 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/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/accelerator_controller.h"
@@ skipping 31 matching lines @@
 #include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shelf/shelf_window_watcher.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/locale/locale_notification_controller.h"
+#include "ash/system/logout_confirmation/logout_confirmation_controller.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/wm/app_list_controller.h"
 #include "ash/wm/ash_focus_rules.h"
 #include "ash/wm/ash_native_cursor_manager.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/lock_state_controller.h"
@@ skipping 11 matching lines @@
 #include "ash/wm/toplevel_window_event_handler.h"
 #include "ash/wm/user_activity_detector.h"
 #include "ash/wm/video_detector.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_positioner.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
+#include "base/time/default_tick_clock.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/user_action_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/events/event_target_iterator.h"
@@ skipping 553 matching lines @@
 
   // TooltipController is deleted with the Shell so removing its references.
   RemovePreTargetHandler(tooltip_controller_.get());
 
   // AppList needs to be released before shelf layout manager, which is
   // destroyed with shelf container in the loop below. However, app list
   // container is now on top of shelf container and released after it.
   // TODO(xiyuan): Move it back when app list container is no longer needed.
   app_list_controller_.reset();
 
+  // Destroy the LogoutConfirmationController before the SystemTrayDelegate.
+  logout_confirmation_controller_.reset();
+
   // Destroy SystemTrayDelegate before destroying the status area(s).
   system_tray_delegate_->Shutdown();
   system_tray_delegate_.reset();
 
   locale_notification_controller_.reset();
 
   // Drag-and-drop must be canceled prior to close all windows.
   drag_drop_controller_.reset();
 
   // Controllers who have WindowObserver added must be deleted
@@ skipping 277 matching lines @@
   // Initialize system_tray_delegate_ before initializing StatusAreaWidget.
   system_tray_delegate_.reset(delegate()->CreateSystemTrayDelegate());
   DCHECK(system_tray_delegate_.get());
 
   locale_notification_controller_.reset(
       new internal::LocaleNotificationController);
 
   // Initialize system_tray_delegate_ after StatusAreaWidget is created.
   system_tray_delegate_->Initialize();
 
+  // Create the LogoutConfirmationController after the SystemTrayDelegate.
+  logout_confirmation_controller_.reset(
+      new internal::LogoutConfirmationController(
+          scoped_ptr<base::TickClock>(new base::DefaultTickClock),

[stevenjb, 2014/02/27 17:58:44]

nit: use make_scoped_ptr?

[bartfab (slow), 2014/02/28 12:13:49]

make_scoped_ptr cannot be used when upcasting, as done here from a
DefaultTickClock to a TickClock.

[stevenjb, 2014/03/04 23:33:29]

Ah, I missed the upcast. I like this version better without the need for a cast.

+          base::Bind(&SystemTrayDelegate::SignOut,
+                     base::Unretained(system_tray_delegate_.get()))));

[stevenjb, 2014/02/27 17:58:44]

Even though we are explicitly creating/destroying LogoutConfirmationController
after/before SystemTrayDelegate, it might be more clear/robust/maintainable to
use a local function that calls ash::Shell::GetInstance(), checks
shell->system_tray_delegate(), and calls
shell->system_tray_delegate()->SignOut(). That way even if the callback somehow
outlives LogoutConfirmationController, or code gets moved around, the callback
will still be safe.

[bartfab (slow), 2014/02/28 12:13:49]

The reason for doing it this way is that I can supply a different closure for
tests. It is essentially a delegate interface. SystemTrayDelegate::SignOut() is
one possible delegate. Tests will use another delegate that records that the
method has been called only.

[stevenjb, 2014/03/04 23:33:29]

Testability is important, but stability even more so. It looks like this would
be safe since logout_confirmation_controller_ is destroyed before
system_tray_delegate_, but that's only true so long as
LogoutConfirtmationController never passes along the callback. We might want to
at least make a comment to that effect.

Meanwhile, in convincing myself of that I think we may have a different edge
case, I'll comment that part of the code separately.

[bartfab (slow), 2014/03/05 18:19:44]

Added a comment.

+
   // TODO(oshima): Initialize all RootWindowControllers once, and
   // initialize controller/delegates above when initializing the
   // primary root window controller.
   internal::RootWindowController::CreateForPrimaryDisplay(
       root_window->GetDispatcher());
 
   display_controller_->InitSecondaryDisplays();
 
   // It needs to be created after RootWindowController has been created
   // (which calls OnWindowResized has been called, otherwise the
@@ skipping 118 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash