Move yet more from WmShell to Shell

Move yet more from WmShell to Shell

BUG=687660
TEST=covered by tests
R=xiyuan@chromium.org

Review-Url: https://codereview.chromium.org/2761373002
Cr-Commit-Position: refs/heads/master@{#458625}
Committed: https://chromium.googlesource.com/chromium/src/+/5ad143ad7e9fea28bd87d3d64eef36958d8aa8b6

[xiyuan, 2017-03-21 18:30:46]

lgtm

[sky, 2017-03-21 19:40:37]

The CQ bit was checked by sky@chromium.org

[sky, 2017-03-21 19:40:38]

The patchset sent to the CQ was uploaded after l-g-t-m from xiyuan@chromium.org
Link to the patchset: https://codereview.chromium.org/2761373002/#ps20001
(title: "merge")

[commit-bot: I haz the power, 2017-03-21 19:41:03]

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-03-21 20:20:48]

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

[commit-bot: I haz the power, 2017-03-21 20:20:50]

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

[sky, 2017-03-21 20:25:33]

The CQ bit was checked by sky@chromium.org

[sky, 2017-03-21 20:25:34]

The patchset sent to the CQ was uploaded after l-g-t-m from xiyuan@chromium.org
Link to the patchset: https://codereview.chromium.org/2761373002/#ps40001
(title: "make CreateShelfView public")

[commit-bot: I haz the power, 2017-03-21 20:26:05]

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-03-21 21:59:56]

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

[commit-bot: I haz the power, 2017-03-21 21:59:58]

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

[sky, 2017-03-21 22:00:44]

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

[commit-bot: I haz the power, 2017-03-21 22:01:10]

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-03-21 22:22:17]

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

[commit-bot: I haz the power, 2017-03-21 22:22:18]

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

[sky, 2017-03-21 22:41:56]

I encountered some shutdown issues that seemed best if I promote
shelf_controller_ too. Take another look?

[xiyuan, 2017-03-21 22:48:50]

still lgtm

[sky, 2017-03-21 22:49:13]

The CQ bit was checked by sky@chromium.org

[commit-bot: I haz the power, 2017-03-21 22:49:40]

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-03-21 23:39:56]

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

[commit-bot: I haz the power, 2017-03-21 23:39:58]

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

Patch:      
chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
Index:
chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
diff --git
a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
index
dd059dc44a918d12e09dba57445d8206bb5047ab..51307ed0864b463116043e3a29b589be788c5dc8
100644
--- a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
@@ -5,8 +5,8 @@
 #include
"chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h"
 
 #include "ash/common/shelf/shelf_delegate.h"
-#include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
+#include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "base/stl_util.h"
@@ -173,7 +173,7 @@ void
ExtensionAppWindowLauncherController::RegisterApp(AppWindow* app_window) {
     // If there is already a shelf id mapped to this app_shelf_id (e.g.
pinned),
     // use that shelf item.
     shelf_id =
-        ash::WmShell::Get()->shelf_delegate()->GetShelfIDForAppIDAndLaunchID(
+        ash::Shell::Get()->shelf_delegate()->GetShelfIDForAppIDAndLaunchID(
             app_id, launch_id);
 
     if (shelf_id == 0) {

[sky, 2017-03-22 00:00:29]

The CQ bit was checked by sky@chromium.org

[sky, 2017-03-22 00:00:30]

The patchset sent to the CQ was uploaded after l-g-t-m from xiyuan@chromium.org
Link to the patchset: https://codereview.chromium.org/2761373002/#ps80001
(title: "merge")

[commit-bot: I haz the power, 2017-03-22 00:00:46]

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-03-22 02:02:15]

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

[sky, 2017-03-22 03:09:42]

The CQ bit was checked by sky@chromium.org

[commit-bot: I haz the power, 2017-03-22 03:10:30]

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-03-22 04:31:28]

CQ is committing da patch.

Bot data: {"patchset_id": 80001, "attempt_start_ts": 1490152182294900,
"parent_rev": "9ea8c5aa070f326692f42b97b569d6d78606f467", "commit_rev":
"5ad143ad7e9fea28bd87d3d64eef36958d8aa8b6"}

[commit-bot: I haz the power, 2017-03-22 04:38:43]

Description was changed from

==========
Move yet more from WmShell to Shell

BUG=687660
TEST=covered by tests
R=xiyuan@chromium.org
==========

to

==========
Move yet more from WmShell to Shell

BUG=687660
TEST=covered by tests
R=xiyuan@chromium.org

Review-Url: https://codereview.chromium.org/2761373002
Cr-Commit-Position: refs/heads/master@{#458625}
Committed:
https://chromium.googlesource.com/chromium/src/+/5ad143ad7e9fea28bd87d3d64eef...
==========

[commit-bot: I haz the power, 2017-03-22 04:38:49]

Committed patchset #5 (id:80001) as
https://chromium.googlesource.com/chromium/src/+/5ad143ad7e9fea28bd87d3d64eef...