Notify about major session changes events.

ash/shelf/shelf_layout_manager.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/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <string>
@@ skipping 195 matching lines @@
       mouse_over_shelf_when_auto_hide_timer_started_(false),
       bezel_event_filter_(new ShelfBezelEventFilter(this)),
       gesture_drag_status_(GESTURE_DRAG_NONE),
       gesture_drag_amount_(0.f),
       gesture_drag_auto_hide_state_(SHELF_AUTO_HIDE_SHOWN),
       update_shelf_observer_(NULL),
       duration_override_in_ms_(0) {
   Shell::GetInstance()->AddShellObserver(this);
   Shell::GetInstance()->lock_state_controller()->AddObserver(this);
   aura::client::GetActivationClient(root_window_)->AddObserver(this);
+  Shell::GetInstance()->session_state_delegate()->AddSessionStateObserver(this);
 }
 
 ShelfLayoutManager::~ShelfLayoutManager() {
   if (update_shelf_observer_)
     update_shelf_observer_->Detach();
 
   FOR_EACH_OBSERVER(ShelfLayoutManagerObserver, observers_, WillDeleteShelf());
   Shell::GetInstance()->RemoveShellObserver(this);
   Shell::GetInstance()->lock_state_controller()->RemoveObserver(this);
   aura::client::GetActivationClient(root_window_)->RemoveObserver(this);
@@ skipping 507 matching lines @@
   status_bounds.set_x(status_bounds.x() +
                       target_bounds.shelf_bounds_in_root.x());
   status_bounds.set_y(status_bounds.y() +
                       target_bounds.shelf_bounds_in_root.y());
   shelf_->status_area_widget()->SetBounds(
       ScreenUtil::ConvertRectToScreen(
           shelf_->status_area_widget()->GetNativeView()->parent(),
           status_bounds));
   SessionStateDelegate* session_state_delegate =
       Shell::GetInstance()->session_state_delegate();
-  if (!state_.is_screen_locked &&
-      (session_state_delegate->IsActiveUserSessionStarted() ||
-       !keyboard_bounds_.IsEmpty())) {
-    Shell::GetInstance()->SetDisplayWorkAreaInsets(
-        root_window_, target_bounds.work_area_insets);
+  if (!state_.is_screen_locked) {
+    gfx::Insets insets;

[Mr4D (OOO till 08-26), 2014/04/10 01:33:08]

By creating the insets they should be initialized to 0. As such line 749-756
could be simplified to:

if (!session_state_delegate->IsUserSessionBlocked() ||
    !keyboard_bounds_.IsEmpty()) {
  insets = target_bounds.work_area_insets;
}

[Nikita (slow), 2014/04/10 09:52:21]

Done.

+    // If user session is blocked (login to new user session or add user to
+    // the existing session - multi-profile) then give 100% of work area only if
+    // keyboard is not shown.
+    if (session_state_delegate->IsUserSessionBlocked()) {
+      if (keyboard_bounds_.IsEmpty())
+        insets = gfx::Insets();
+      else
+        insets = target_bounds.work_area_insets;
+    } else {
+      insets = target_bounds.work_area_insets;
+    }
+    Shell::GetInstance()->SetDisplayWorkAreaInsets(root_window_, insets);
   }
 }
 
 void ShelfLayoutManager::StopAnimating() {
   GetLayer(shelf_)->GetAnimator()->StopAnimating();
   GetLayer(shelf_->status_area_widget())->GetAnimator()->StopAnimating();
 }
 
 void ShelfLayoutManager::GetShelfSize(int* width, int* height) {
   *width = *height = 0;
@@ skipping 400 matching lines @@
 
   keyboard_bounds_ = new_bounds;
   OnWindowResized();
 
   SessionStateDelegate* session_state_delegate =
       Shell::GetInstance()->session_state_delegate();
 
   // On login screen if keyboard has been just hidden, update bounds just once
   // but ignore target_bounds.work_area_insets since shelf overlaps with login
   // window.
-  if (!session_state_delegate->IsActiveUserSessionStarted() &&
+  if (session_state_delegate->IsUserSessionBlocked() &&
       keyboard_is_about_to_hide) {
     Shell::GetInstance()->SetDisplayWorkAreaInsets(root_window_, gfx::Insets());
   }
 }
 
 void ShelfLayoutManager::OnDockBoundsChanging(
     const gfx::Rect& dock_bounds,
     DockedWindowLayoutManagerObserver::Reason reason) {
   // Skip shelf layout in case docked notification originates from this class.
   if (reason == DISPLAY_INSETS_CHANGED)
@@ skipping 14 matching lines @@
     // Hide the status area widget (using auto hide animation).
     base::AutoReset<ShelfVisibilityState> state(&state_.visibility_state,
                                                 SHELF_HIDDEN);
     TargetBounds target_bounds;
     CalculateTargetBounds(state_, &target_bounds);
     UpdateBoundsAndOpacity(target_bounds, true, NULL);
     UpdateVisibilityState();
   }
 }
 
+void ShelfLayoutManager::SessionStateChanged(
+    SessionStateDelegate::SessionState state) {
+  TargetBounds target_bounds;
+  CalculateTargetBounds(state_, &target_bounds);
+  UpdateBoundsAndOpacity(target_bounds, true, NULL);
+  UpdateVisibilityState();
+}
+
 }  // namespace ash