Clean up SessionStateDelegate in chrome

Clean up SessionStateDelegate in chrome

BUG=648964
Review-Url: https://codereview.chromium.org/2619083002
Cr-Commit-Position: refs/heads/master@{#442300}
Committed: https://chromium.googlesource.com/chromium/src/+/f7d4caad1b47aa9b28713a164a1435feb31946c7

[xiyuan, 2017-01-06 22:43:28]

The CQ bit was checked by xiyuan@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-06 22:44:04]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[xiyuan, 2017-01-06 23:25:44]

xiyuan@chromium.org changed reviewers:
+ jamescook@chromium.org

[xiyuan, 2017-01-06 23:25:45]

Clean up SessionStateDelegate reference in c/b/ui/ash. I have not touched
MediaClient/ChromeShellContentState and multi-user window manager code files. 

riajiang@ is working on http://crbug.com/676091 and probably would update
MediaClient/ChromeShellContentState.

Not sure how to handle multi-user window manager code so leave them unchanged.
:(

[commit-bot: I haz the power, 2017-01-06 23:28:18]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-06 23:28:18]

Dry run: Try jobs failed on following builders:
  linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[James Cook, 2017-01-06 23:52:44]

LGTM

Don't worry about multi-login for now.

https://codereview.chromium.org/2619083002/diff/20001/chrome/browser/ui/ash/s...
File chrome/browser/ui/ash/session_controller_client.cc (right):

https://codereview.chromium.org/2619083002/diff/20001/chrome/browser/ui/ash/s...
chrome/browser/ui/ash/session_controller_client.cc:254:
session_manager::SessionManager* const session_manager =
optional: I'm OK with "using session_manager::SessionManager" if it makes line
wrapping better (here and in other files)

https://codereview.chromium.org/2619083002/diff/20001/components/session_mana...
File components/session_manager/core/session_manager.cc (right):

https://codereview.chromium.org/2619083002/diff/20001/components/session_mana...
components/session_manager/core/session_manager.cc:66: return session_state_ ==
session_manager::SessionState::LOGIN_SECONDARY;
nit: I don't think session_manager:: is needed here or below

[xiyuan, 2017-01-06 23:59:14]

The CQ bit was checked by xiyuan@chromium.org to run a CQ dry run

[xiyuan, 2017-01-06 23:59:26]

The CQ bit was unchecked by xiyuan@chromium.org

[xiyuan, 2017-01-07 00:07:26]

The CQ bit was checked by xiyuan@chromium.org to run a CQ dry run

[xiyuan, 2017-01-07 00:07:32]

https://codereview.chromium.org/2619083002/diff/20001/chrome/browser/ui/ash/s...
File chrome/browser/ui/ash/session_controller_client.cc (right):

https://codereview.chromium.org/2619083002/diff/20001/chrome/browser/ui/ash/s...
chrome/browser/ui/ash/session_controller_client.cc:254:
session_manager::SessionManager* const session_manager =
On 2017/01/06 23:52:43, James Cook wrote:
> optional: I'm OK with "using session_manager::SessionManager" if it makes line
> wrapping better (here and in other files)

Done.

https://codereview.chromium.org/2619083002/diff/20001/components/session_mana...
File components/session_manager/core/session_manager.cc (right):

https://codereview.chromium.org/2619083002/diff/20001/components/session_mana...
components/session_manager/core/session_manager.cc:66: return session_state_ ==
session_manager::SessionState::LOGIN_SECONDARY;
On 2017/01/06 23:52:43, James Cook wrote:
> nit: I don't think session_manager:: is needed here or below

Right. Remove here the Line 70.

[commit-bot: I haz the power, 2017-01-07 00:07:52]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-07 00:36:32]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-07 00:36:33]

Dry run: This issue passed the CQ dry run.

[xiyuan, 2017-01-09 17:23:15]

The CQ bit was checked by xiyuan@chromium.org

[xiyuan, 2017-01-09 17:23:15]

The patchset sent to the CQ was uploaded after l-g-t-m from
jamescook@chromium.org
Link to the patchset: https://codereview.chromium.org/2619083002/#ps40001
(title: "for #2 comments")

[commit-bot: I haz the power, 2017-01-09 17:23:43]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-09 18:14:07]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-09 18:14:10]

Failed to apply patch for
chrome/browser/ui/ash/launcher/launcher_context_menu.cc:
While running git apply --index -p1;
  error: patch failed:
chrome/browser/ui/ash/launcher/launcher_context_menu.cc:26
  error: chrome/browser/ui/ash/launcher/launcher_context_menu.cc: patch does not
apply

Patch:       chrome/browser/ui/ash/launcher/launcher_context_menu.cc
Index: chrome/browser/ui/ash/launcher/launcher_context_menu.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
index
aa70210eac001e319a02822122bc7a2959a8aa76..80db26fe2ff1926a6f8ff48a1752200038b552f7
100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/strings/grit/ash_strings.h"
@@ -26,6 +25,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
+#include "components/session_manager/core/session_manager.h"
 #include "content/public/common/context_menu_params.h"
 
 #if defined(OS_CHROMEOS)
@@ -190,7 +190,7 @@ void LauncherContextMenu::AddShelfOptionsMenu() {
                              IDS_ASH_SHELF_CONTEXT_MENU_AUTO_HIDE);
   }
   if (ash::WmShelf::CanChangeShelfAlignment() &&
-      !ash::WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked()) {
+      !session_manager::SessionManager::Get()->IsScreenLocked()) {
     AddSubMenuWithStringId(MENU_ALIGNMENT_MENU,
                            IDS_ASH_SHELF_CONTEXT_MENU_POSITION,
                            &shelf_alignment_menu_);

[xiyuan, 2017-01-09 18:29:24]

The CQ bit was checked by xiyuan@chromium.org

[xiyuan, 2017-01-09 18:29:24]

The patchset sent to the CQ was uploaded after l-g-t-m from
jamescook@chromium.org
Link to the patchset: https://codereview.chromium.org/2619083002/#ps60001
(title: "rebase")

[commit-bot: I haz the power, 2017-01-09 18:29:57]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-09 19:03:56]

CQ is committing da patch.

Bot data: {"patchset_id": 60001, "attempt_start_ts": 1483986564195560,
"parent_rev": "d65a54696be52d7f118265c08e23401ed35e42b8", "commit_rev":
"f7d4caad1b47aa9b28713a164a1435feb31946c7"}

[commit-bot: I haz the power, 2017-01-09 19:04:29]

Description was changed from

==========
Clean up SessionStateDelegate in chrome

BUG=648964
==========

to

==========
Clean up SessionStateDelegate in chrome

BUG=648964

Review-Url: https://codereview.chromium.org/2619083002
Cr-Commit-Position: refs/heads/master@{#442300}
Committed:
https://chromium.googlesource.com/chromium/src/+/f7d4caad1b47aa9b28713a164a14...
==========

[commit-bot: I haz the power, 2017-01-09 19:04:33]

Committed patchset #4 (id:60001) as
https://chromium.googlesource.com/chromium/src/+/f7d4caad1b47aa9b28713a164a14...