mash: Move session_types.h to ash/public

So that it can be used for mojo type mapping.

BUG=648964

Review-Url: https://codereview.chromium.org/2538113005
Cr-Commit-Position: refs/heads/master@{#435709}

ash/BUILD.gn

@@ -135,7 +135,6 @@ component("ash") {
     "common/session/session_state_delegate.h",
     "common/session/session_state_observer.cc",
     "common/session/session_state_observer.h",
-    "common/session/session_types.h",
     "common/shelf/app_list_button.cc",
     "common/shelf/app_list_button.h",
     "common/shelf/app_list_shelf_item_delegate.cc",
@@ -1023,6 +1022,7 @@ component("ash_with_content") {
     ":ash",
   ]
   deps = [
+    "//ash/public/cpp",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//content/public/browser",

ash/common/media_delegate.h

@@ -5,7 +5,7 @@
 #ifndef ASH_COMMON_MEDIA_DELEGATE_H_
 #define ASH_COMMON_MEDIA_DELEGATE_H_
 
-#include "ash/common/session/session_types.h"
+#include "ash/public/cpp/session_types.h"
 
 namespace ash {
 

ash/common/session/session_state_delegate.h

@@ -6,7 +6,7 @@
 #define ASH_COMMON_SESSION_SESSION_STATE_DELEGATE_H_
 
 #include "ash/ash_export.h"
-#include "ash/common/session/session_types.h"
+#include "ash/public/cpp/session_types.h"
 #include "components/session_manager/session_manager_types.h"
 
 class AccountId;

ash/common/system/user/tray_user.h

@@ -6,9 +6,9 @@
 #define ASH_COMMON_SYSTEM_USER_TRAY_USER_H_
 
 #include "ash/ash_export.h"
-#include "ash/common/session/session_types.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/user/user_observer.h"
+#include "ash/public/cpp/session_types.h"
 #include "base/macros.h"
 
 namespace gfx {

ash/common/system/user/user_view.h

@@ -7,9 +7,9 @@
 
 #include <memory>
 
-#include "ash/common/session/session_types.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/user/tray_user.h"
+#include "ash/public/cpp/session_types.h"
 #include "base/macros.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/focus/focus_manager.h"

ash/content/shell_content_state.h

@@ -5,8 +5,8 @@
 #ifndef ASH_CONTENT_SHELL_CONTENT_STATE_H_
 #define ASH_CONTENT_SHELL_CONTENT_STATE_H_
 
-#include "ash/common/session/session_types.h"
 #include "ash/content/ash_with_content_export.h"
+#include "ash/public/cpp/session_types.h"
 #include "base/macros.h"
 
 #if defined(OS_CHROMEOS)

ash/public/cpp/BUILD.gn

@@ -5,6 +5,7 @@
 # C++ headers and sources that can be used outside ash.
 source_set("cpp") {
   sources = [
+    "session_types.h",
     "shelf_types.h",
     "shell_window_ids.cc",
     "shell_window_ids.h",

ash/common/session/session_types.h → ash/public/cpp/session_types.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_COMMON_SESSION_SESSION_TYPES_H_
-#define ASH_COMMON_SESSION_SESSION_TYPES_H_
+#ifndef ASH_PUBLIC_CPP_SESSION_TYPES_H_
+#define ASH_PUBLIC_CPP_SESSION_TYPES_H_
 
 namespace ash {
 
@@ -25,4 +25,4 @@ enum class AddUserSessionPolicy {
 
 }  // namespace ash
 
-#endif  // ASH_COMMON_SESSION_SESSION_TYPES_H_
+#endif  // ASH_PUBLIC_CPP_SESSION_TYPES_H_