mash: Move //ash/session to //ash/common/session

ash/common/session/session_state_observer.cc

Index: ash/common/session/session_state_observer.cc
diff --git a/ash/session/session_state_observer.cc b/ash/common/session/session_state_observer.cc
similarity index 51%
rename from ash/session/session_state_observer.cc
rename to ash/common/session/session_state_observer.cc
index 48c994eaacef8ba21aa0e1986a105ef5fc086ce0..a05607ee0823cc000ad9aeebb3d05b76dcfd4b3d 100644
--- a/ash/session/session_state_observer.cc
+++ b/ash/common/session/session_state_observer.cc
@@ -2,24 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/session/session_state_observer.h"
+#include "ash/common/session/session_state_observer.h"
 
-#include "ash/session/session_state_delegate.h"
-#include "ash/shell.h"
+#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm_shell.h"
 
 namespace ash {
 
 ScopedSessionStateObserver::ScopedSessionStateObserver(
-    ash::SessionStateObserver* observer)
+    SessionStateObserver* observer)
     : observer_(observer) {
-  ash::Shell::GetInstance()->session_state_delegate()->AddSessionStateObserver(
-      observer_);
+  WmShell::Get()->GetSessionStateDelegate()->AddSessionStateObserver(observer_);
 }
 
 ScopedSessionStateObserver::~ScopedSessionStateObserver() {
-  ash::Shell::GetInstance()
-      ->session_state_delegate()
-      ->RemoveSessionStateObserver(observer_);
+  WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(
+      observer_);
 }
 
 }  // namespace ash