Revert 194578 "Add ash SessionStateDelegate"

trunk/src/ash/shelf/shelf_widget.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_widget.h"
 
 #include "ash/focus_cycler.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_navigator.h"
 #include "ash/launcher/launcher_view.h"
 #include "ash/root_window_controller.h"
-#include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
+#include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/status_area_layout_manager.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/workspace_controller.h"
 #include "grit/ash_resources.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
@@ skipping 406 matching lines @@
   params.parent = shelf_container;
   params.delegate = delegate_view_;
   Init(params);
 
   // The shelf should not take focus when initially shown.
   set_focus_on_creation(false);
   SetContentsView(delegate_view_);
 
   status_area_widget_ = new internal::StatusAreaWidget(status_container);
   status_area_widget_->CreateTrayViews();
-  if (Shell::GetInstance()->session_state_delegate()->
-          IsActiveUserSessionStarted()) {
+  if (Shell::GetInstance()->delegate()->IsSessionStarted())
     status_area_widget_->Show();
-  }
   Shell::GetInstance()->focus_cycler()->AddWidget(status_area_widget_);
 
   shelf_layout_manager_ = new internal::ShelfLayoutManager(this);
   shelf_container->SetLayoutManager(shelf_layout_manager_);
   shelf_layout_manager_->set_workspace_controller(workspace_controller);
   workspace_controller->SetShelf(shelf_layout_manager_);
 
   status_container->SetLayoutManager(
       new internal::StatusAreaLayoutManager(this));
 
@@ skipping 36 matching lines @@
     launcher_.reset(new Launcher(shell->launcher_model(),
                                  shell->GetLauncherDelegate(),
                                  this));
 
     SetFocusCycler(shell->focus_cycler());
 
     // Inform the root window controller.
     internal::RootWindowController::ForWindow(window_container_)->
         OnLauncherCreated();
 
-    launcher_->SetVisible(
-        shell->session_state_delegate()->IsActiveUserSessionStarted());
+    ShellDelegate* delegate = shell->delegate();
+    if (delegate)
+      launcher_->SetVisible(delegate->IsSessionStarted());
 
     Show();
   }
 }
 
 bool ShelfWidget::IsLauncherVisible() const {
   return launcher_.get() && launcher_->IsVisible();
 }
 
 void ShelfWidget::SetLauncherVisibility(bool visible) {
@@ skipping 41 matching lines @@
   return -1;
 }
 
 void ShelfWidget::DisableDimmingAnimationsForTest() {
   DCHECK(delegate_view_);
   return delegate_view_->disable_dimming_animations_for_test();
 }
 
 }  // namespace ash