Revert 194578 "Add ash SessionStateDelegate"

trunk/src/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/focus_manager_factory.h"
@@ skipping 10 matching lines @@
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/focus_cycler.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/host/root_window_host_factory.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
-#include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.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/activation_controller.h"
 #include "ash/wm/always_on_top_controller.h"
@@ skipping 511 matching lines @@
 
   // This controller needs to be set before SetupManagedWindowMode.
   desktop_background_controller_.reset(new DesktopBackgroundController());
   user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate());
   if (!user_wallpaper_delegate_.get())
     user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate());
 
   // StatusAreaWidget uses Shell's CapsLockDelegate.
   caps_lock_delegate_.reset(delegate_->CreateCapsLockDelegate());
 
-  session_state_delegate_.reset(delegate_->CreateSessionStateDelegate());
-
   if (!command_line->HasSwitch(views::corewm::switches::kNoDropShadows)) {
     resize_shadow_controller_.reset(new internal::ResizeShadowController());
     shadow_controller_.reset(
         new views::corewm::ShadowController(activation_client_));
   }
 
   // Create system_tray_notifier_ before the delegate.
   system_tray_notifier_.reset(new ash::SystemTrayNotifier());
 
   // Initialize system_tray_delegate_ before initializing StatusAreaWidget.
@@ skipping 23 matching lines @@
   cursor_manager_.SetCursor(ui::kCursorPointer);
 
   if (!cursor_manager_.IsCursorVisible()) {
     // Cursor might have been hidden by something other than chrome.
     // Let the first mouse event show the cursor.
     env_filter_->set_cursor_hidden_by_filter(true);
   }
 }
 
 void Shell::ShowContextMenu(const gfx::Point& location_in_screen) {
-  // No context menus if there is no session with an active user.
-  if (!session_state_delegate_->HasActiveUser())
+  // No context menus if user have not logged in.
+  if (!delegate_->IsUserLoggedIn())
     return;
   // No context menus when screen is locked.
-  if (session_state_delegate_->IsScreenLocked())
+  if (IsScreenLocked())
     return;
 
   aura::RootWindow* root =
       wm::GetRootWindowMatching(gfx::Rect(location_in_screen, gfx::Size()));
   // TODO(oshima): The root and root window controller shouldn't be
   // NULL even for the out-of-bounds |location_in_screen| (It should
   // return the primary root). Investigate why/how this is
   // happening. crbug.com/165214.
   internal::RootWindowController* rwc = GetRootWindowController(root);
   CHECK(rwc) << "root=" << root
@@ skipping 13 matching lines @@
 
 bool Shell::GetAppListTargetVisibility() const {
   return app_list_controller_.get() &&
       app_list_controller_->GetTargetVisibility();
 }
 
 aura::Window* Shell::GetAppListWindow() {
   return app_list_controller_.get() ? app_list_controller_->GetWindow() : NULL;
 }
 
+bool Shell::CanLockScreen() {
+  return delegate_->CanLockScreen();
+}
+
+bool Shell::IsScreenLocked() const {
+  return delegate_->IsScreenLocked();
+}
+
 bool Shell::IsSystemModalWindowOpen() const {
   if (simulate_modal_window_open_for_testing_)
     return true;
   const std::vector<aura::Window*> containers = GetContainersFromAllRootWindows(
       internal::kShellWindowId_SystemModalContainer, NULL);
   for (std::vector<aura::Window*>::const_iterator cit = containers.begin();
        cit != containers.end(); ++cit) {
     for (aura::Window::Windows::const_iterator wit = (*cit)->children().begin();
          wit != (*cit)->children().end(); ++wit) {
       if ((*wit)->GetProperty(aura::client::kModalKey) ==
@@ skipping 283 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     active_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash