mash: Limit ShelfWindowWatcher to panels and dialogs.

mash: Limit ShelfWindowWatcher to panels and dialogs.

Chrome now syncs its own ShelfModel with Ash in Mash.
Avoid ShelfWindowWatcher and ChromeLauncherController clashing.
(ie. don't create SWW items for windows that CLC will handle)

Set TYPE_APP for extension and arc app windows to avoid SWW items.
Set TYPE_APP_PANEL in extension code; simplify ChromeNativeAppWindowViewsAuraAsh.

Make SWW items for transient windows (per discussion w/oshima).
Only make SWW items for WINDOW_TYPE_NORMAL windows w/o a ShelfItemType.
(avoid making items for [transient] controls, popups, etc.)

Only make SWW items for visible windows (or minimized panels).
(clients set a ShelfItemType before Show() to avoid SWW items)
(fixes StatusAreaBubble, prior to WindowState::ignored_by_shelf)

Expand and refine ShelfWindowWatcher unit tests.
Fix simulated panel window creation in other unit tests.
Restore ExperimentalAppWindowApiTest.SetIcon to mash white lists.
Disable WindowSelectorTest.MultipleDisplays in mash for now.

TODO: Determine why OnAppWindowAdded is only called in Mash...

BUG=557406, 679087, 695562, 729425, 730759
TEST=Automated; chrome --mash doesn't crash opening the wallpaper picker.
R=sky@chromium.org
TBR=jamescook@chromium.org

Review-Url: https://codereview.chromium.org/2927693002
Cr-Commit-Position: refs/heads/master@{#477884}
Committed: https://chromium.googlesource.com/chromium/src/+/feae432eb3cfeafbd4c30795171ac46462a23c80

[msw, 2017-06-07 01:24:12]

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

[commit-bot: I haz the power, 2017-06-07 01:24:39]

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-06-07 02:26:21]

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

[commit-bot: I haz the power, 2017-06-07 02:26:22]

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_...)

[msw, 2017-06-07 19:59:57]

Description was changed from

==========
mash: Do not create ShelfWindowWatcher items for apps.

BUG=557406,729425,679087
==========

to

==========
mash: Do not create ShelfWindowWatcher items for apps.

BUG=557406,729425,679087,730759
==========

[msw, 2017-06-07 22:53:15]

Description was changed from

==========
mash: Do not create ShelfWindowWatcher items for apps.

BUG=557406,729425,679087,730759
==========

to

==========
mash: Do not create ShelfWindowWatcher items for apps.

BUG=557406,679087,695562,729425,730759
==========

[msw, 2017-06-07 23:26:26]

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

[commit-bot: I haz the power, 2017-06-07 23:27:00]

Dry run: CQ is trying da patch.

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

[msw, 2017-06-07 23:39:43]

Description was changed from

==========
mash: Do not create ShelfWindowWatcher items for apps.

BUG=557406,679087,695562,729425,730759
==========

to

==========
mash: Limit ShelfWindowWatcher to panels and dialogs.

Chrome now syncs its own ShelfModel with Ash in Mash.
Avoid ShelfWindowWatcher and ChromeLauncherController clashing.
(ie. don't create SWW items for windows that CLC will handle)

Set TYPE_APP for extension and arc app windows to avoid SWW items.
Set TYPE_APP_PANEL in extension code; simplify
ChromeNativeAppWindowViewsAuraAsh.

Make SWW items for transient windows (per discussion w/oshima).
Only make SWW items for WINDOW_TYPE_NORMAL windows w/o a ShelfItemType.
(avoid making items for [transient] controls, popups, etc.)

Only make SWW items for visible windows (or minimized panels).
(clients set a ShelfItemType before Show() to avoid SWW items)
(fixes StatusAreaBubble, prior to WindowState::ignored_by_shelf)

Expand and refine ShelfWindowWatcher unit tests.
Fix simulated panel window creation in other unit tests.
Restore ExperimentalAppWindowApiTest.SetIcon to mash white lists.

TODO: Determine why OnAppWindowAdded is only called in Mash...

BUG=557406,679087,695562,729425,730759
TEST=Automated; chrome --mash doesn't crash opening the wallpaper picker.
R=jamescook@chromium.org
==========

[msw, 2017-06-07 23:39:43]

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

[msw, 2017-06-07 23:41:05]

Hey James, please take a look; thanks!
(hopefully I can land this before leaving!)

[msw, 2017-06-07 23:41:57]

Description was changed from

==========
mash: Limit ShelfWindowWatcher to panels and dialogs.

Chrome now syncs its own ShelfModel with Ash in Mash.
Avoid ShelfWindowWatcher and ChromeLauncherController clashing.
(ie. don't create SWW items for windows that CLC will handle)

Set TYPE_APP for extension and arc app windows to avoid SWW items.
Set TYPE_APP_PANEL in extension code; simplify
ChromeNativeAppWindowViewsAuraAsh.

Make SWW items for transient windows (per discussion w/oshima).
Only make SWW items for WINDOW_TYPE_NORMAL windows w/o a ShelfItemType.
(avoid making items for [transient] controls, popups, etc.)

Only make SWW items for visible windows (or minimized panels).
(clients set a ShelfItemType before Show() to avoid SWW items)
(fixes StatusAreaBubble, prior to WindowState::ignored_by_shelf)

Expand and refine ShelfWindowWatcher unit tests.
Fix simulated panel window creation in other unit tests.
Restore ExperimentalAppWindowApiTest.SetIcon to mash white lists.

TODO: Determine why OnAppWindowAdded is only called in Mash...

BUG=557406,679087,695562,729425,730759
TEST=Automated; chrome --mash doesn't crash opening the wallpaper picker.
R=jamescook@chromium.org
==========

to

==========
mash: Limit ShelfWindowWatcher to panels and dialogs.

Chrome now syncs its own ShelfModel with Ash in Mash.
Avoid ShelfWindowWatcher and ChromeLauncherController clashing.
(ie. don't create SWW items for windows that CLC will handle)

Set TYPE_APP for extension and arc app windows to avoid SWW items.
Set TYPE_APP_PANEL in extension code; simplify
ChromeNativeAppWindowViewsAuraAsh.

Make SWW items for transient windows (per discussion w/oshima).
Only make SWW items for WINDOW_TYPE_NORMAL windows w/o a ShelfItemType.
(avoid making items for [transient] controls, popups, etc.)

Only make SWW items for visible windows (or minimized panels).
(clients set a ShelfItemType before Show() to avoid SWW items)
(fixes StatusAreaBubble, prior to WindowState::ignored_by_shelf)

Expand and refine ShelfWindowWatcher unit tests.
Fix simulated panel window creation in other unit tests.
Restore ExperimentalAppWindowApiTest.SetIcon to mash white lists.

TODO: Determine why OnAppWindowAdded is only called in Mash...

BUG=557406,679087,695562,729425
TEST=Automated; chrome --mash doesn't crash opening the wallpaper picker.
R=jamescook@chromium.org
==========

[sky, 2017-06-07 23:50:21]

sky@chromium.org changed reviewers:
+ sky@chromium.org

[sky, 2017-06-07 23:50:22]

https://codereview.chromium.org/2927693002/diff/60001/ash/shelf/shelf_window_...
File ash/shelf/shelf_window_watcher.cc (right):

https://codereview.chromium.org/2927693002/diff/60001/ash/shelf/shelf_window_...
ash/shelf/shelf_window_watcher.cc:249: // Create a new item for |window|, if it
is visible or a [minimized] panel.
Is the assumption that !visible=minimized for panels valid?

https://codereview.chromium.org/2927693002/diff/60001/chrome/browser/ui/ash/l...
File chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
(right):

https://codereview.chromium.org/2927693002/diff/60001/chrome/browser/ui/ash/l...
chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc:291:
window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_APP);
For thought: should we combine AppType and ShelfItemType?

[msw, 2017-06-08 00:00:11]

Thanks for taking a quick look, Scott.

https://codereview.chromium.org/2927693002/diff/60001/ash/shelf/shelf_window_...
File ash/shelf/shelf_window_watcher.cc (right):

https://codereview.chromium.org/2927693002/diff/60001/ash/shelf/shelf_window_...
ash/shelf/shelf_window_watcher.cc:249: // Create a new item for |window|, if it
is visible or a [minimized] panel.
On 2017/06/07 23:50:22, sky wrote:
> Is the assumption that !visible=minimized for panels valid?

Minimized panel windows are not visible; so it's sufficient to create shelf
items for panel windows that are not visible to cover the minimized case. I
could add more rigorous checks around the window type/container and
WindowState::IsMinimized(), but that seems unnecessary (at least for now).
Hopefully we're actually removing panels soon!

https://codereview.chromium.org/2927693002/diff/60001/chrome/browser/ui/ash/l...
File chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
(right):

https://codereview.chromium.org/2927693002/diff/60001/chrome/browser/ui/ash/l...
chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc:291:
window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_APP);
On 2017/06/07 23:50:22, sky wrote:
> For thought: should we combine AppType and ShelfItemType?

Yes, I thought about this as well, I considered trying to eliminate the
ShelfItemType window property as part of this fix, and just relying on the
aura::Window::type (and/or container) and the ash::AppType, but that got tricky
around the Settings browser window, for which we *do* want to create a
ShelfWindowWatcher item, but it has WINDOW_TYPE_NORMAL... As for combining them,
that might work... I'll file a bug just as a brain dump of this, but it doesn't
seem feasible for this CL.

[sky, 2017-06-08 00:03:02]

Ok, LGTM

[commit-bot: I haz the power, 2017-06-08 00:39:42]

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

[commit-bot: I haz the power, 2017-06-08 00:39:42]

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_...)

[msw, 2017-06-08 01:19:10]

Description was changed from

==========
mash: Limit ShelfWindowWatcher to panels and dialogs.

Chrome now syncs its own ShelfModel with Ash in Mash.
Avoid ShelfWindowWatcher and ChromeLauncherController clashing.
(ie. don't create SWW items for windows that CLC will handle)

Set TYPE_APP for extension and arc app windows to avoid SWW items.
Set TYPE_APP_PANEL in extension code; simplify
ChromeNativeAppWindowViewsAuraAsh.

Make SWW items for transient windows (per discussion w/oshima).
Only make SWW items for WINDOW_TYPE_NORMAL windows w/o a ShelfItemType.
(avoid making items for [transient] controls, popups, etc.)

Only make SWW items for visible windows (or minimized panels).
(clients set a ShelfItemType before Show() to avoid SWW items)
(fixes StatusAreaBubble, prior to WindowState::ignored_by_shelf)

Expand and refine ShelfWindowWatcher unit tests.
Fix simulated panel window creation in other unit tests.
Restore ExperimentalAppWindowApiTest.SetIcon to mash white lists.

TODO: Determine why OnAppWindowAdded is only called in Mash...

BUG=557406,679087,695562,729425
TEST=Automated; chrome --mash doesn't crash opening the wallpaper picker.
R=jamescook@chromium.org
==========

to

==========
mash: Limit ShelfWindowWatcher to panels and dialogs.

Chrome now syncs its own ShelfModel with Ash in Mash.
Avoid ShelfWindowWatcher and ChromeLauncherController clashing.
(ie. don't create SWW items for windows that CLC will handle)

Set TYPE_APP for extension and arc app windows to avoid SWW items.
Set TYPE_APP_PANEL in extension code; simplify
ChromeNativeAppWindowViewsAuraAsh.

Make SWW items for transient windows (per discussion w/oshima).
Only make SWW items for WINDOW_TYPE_NORMAL windows w/o a ShelfItemType.
(avoid making items for [transient] controls, popups, etc.)

Only make SWW items for visible windows (or minimized panels).
(clients set a ShelfItemType before Show() to avoid SWW items)
(fixes StatusAreaBubble, prior to WindowState::ignored_by_shelf)

Expand and refine ShelfWindowWatcher unit tests.
Fix simulated panel window creation in other unit tests.
Restore ExperimentalAppWindowApiTest.SetIcon to mash white lists.

TODO: Determine why OnAppWindowAdded is only called in Mash...

BUG=557406,679087,695562,729425,730759
TEST=Automated; chrome --mash doesn't crash opening the wallpaper picker.
R=jamescook@chromium.org
==========

[msw, 2017-06-08 01:19:34]

Description was changed from

==========
mash: Limit ShelfWindowWatcher to panels and dialogs.

Chrome now syncs its own ShelfModel with Ash in Mash.
Avoid ShelfWindowWatcher and ChromeLauncherController clashing.
(ie. don't create SWW items for windows that CLC will handle)

Set TYPE_APP for extension and arc app windows to avoid SWW items.
Set TYPE_APP_PANEL in extension code; simplify
ChromeNativeAppWindowViewsAuraAsh.

Make SWW items for transient windows (per discussion w/oshima).
Only make SWW items for WINDOW_TYPE_NORMAL windows w/o a ShelfItemType.
(avoid making items for [transient] controls, popups, etc.)

Only make SWW items for visible windows (or minimized panels).
(clients set a ShelfItemType before Show() to avoid SWW items)
(fixes StatusAreaBubble, prior to WindowState::ignored_by_shelf)

Expand and refine ShelfWindowWatcher unit tests.
Fix simulated panel window creation in other unit tests.
Restore ExperimentalAppWindowApiTest.SetIcon to mash white lists.

TODO: Determine why OnAppWindowAdded is only called in Mash...

BUG=557406,679087,695562,729425,730759
TEST=Automated; chrome --mash doesn't crash opening the wallpaper picker.
R=jamescook@chromium.org
==========

to

==========
mash: Limit ShelfWindowWatcher to panels and dialogs.

Chrome now syncs its own ShelfModel with Ash in Mash.
Avoid ShelfWindowWatcher and ChromeLauncherController clashing.
(ie. don't create SWW items for windows that CLC will handle)

Set TYPE_APP for extension and arc app windows to avoid SWW items.
Set TYPE_APP_PANEL in extension code; simplify
ChromeNativeAppWindowViewsAuraAsh.

Make SWW items for transient windows (per discussion w/oshima).
Only make SWW items for WINDOW_TYPE_NORMAL windows w/o a ShelfItemType.
(avoid making items for [transient] controls, popups, etc.)

Only make SWW items for visible windows (or minimized panels).
(clients set a ShelfItemType before Show() to avoid SWW items)
(fixes StatusAreaBubble, prior to WindowState::ignored_by_shelf)

Expand and refine ShelfWindowWatcher unit tests.
Fix simulated panel window creation in other unit tests.
Restore ExperimentalAppWindowApiTest.SetIcon to mash white lists.
Disable WindowSelectorTest.MultipleDisplays in mash for now.

TODO: Determine why OnAppWindowAdded is only called in Mash...

BUG=557406,679087,695562,729425,730759
TEST=Automated; chrome --mash doesn't crash opening the wallpaper picker.
R=jamescook@chromium.org
==========

[msw, 2017-06-08 01:20:08]

Description was changed from

==========
mash: Limit ShelfWindowWatcher to panels and dialogs.

Chrome now syncs its own ShelfModel with Ash in Mash.
Avoid ShelfWindowWatcher and ChromeLauncherController clashing.
(ie. don't create SWW items for windows that CLC will handle)

Set TYPE_APP for extension and arc app windows to avoid SWW items.
Set TYPE_APP_PANEL in extension code; simplify
ChromeNativeAppWindowViewsAuraAsh.

Make SWW items for transient windows (per discussion w/oshima).
Only make SWW items for WINDOW_TYPE_NORMAL windows w/o a ShelfItemType.
(avoid making items for [transient] controls, popups, etc.)

Only make SWW items for visible windows (or minimized panels).
(clients set a ShelfItemType before Show() to avoid SWW items)
(fixes StatusAreaBubble, prior to WindowState::ignored_by_shelf)

Expand and refine ShelfWindowWatcher unit tests.
Fix simulated panel window creation in other unit tests.
Restore ExperimentalAppWindowApiTest.SetIcon to mash white lists.
Disable WindowSelectorTest.MultipleDisplays in mash for now.

TODO: Determine why OnAppWindowAdded is only called in Mash...

BUG=557406,679087,695562,729425,730759
TEST=Automated; chrome --mash doesn't crash opening the wallpaper picker.
R=jamescook@chromium.org
==========

to

==========
mash: Limit ShelfWindowWatcher to panels and dialogs.

Chrome now syncs its own ShelfModel with Ash in Mash.
Avoid ShelfWindowWatcher and ChromeLauncherController clashing.
(ie. don't create SWW items for windows that CLC will handle)

Set TYPE_APP for extension and arc app windows to avoid SWW items.
Set TYPE_APP_PANEL in extension code; simplify
ChromeNativeAppWindowViewsAuraAsh.

Make SWW items for transient windows (per discussion w/oshima).
Only make SWW items for WINDOW_TYPE_NORMAL windows w/o a ShelfItemType.
(avoid making items for [transient] controls, popups, etc.)

Only make SWW items for visible windows (or minimized panels).
(clients set a ShelfItemType before Show() to avoid SWW items)
(fixes StatusAreaBubble, prior to WindowState::ignored_by_shelf)

Expand and refine ShelfWindowWatcher unit tests.
Fix simulated panel window creation in other unit tests.
Restore ExperimentalAppWindowApiTest.SetIcon to mash white lists.
Disable WindowSelectorTest.MultipleDisplays in mash for now.

TODO: Determine why OnAppWindowAdded is only called in Mash...

BUG=557406,679087,695562,729425,730759
TEST=Automated; chrome --mash doesn't crash opening the wallpaper picker.
R=sky@chromium.org
TBR=jamescook@chromium.org
==========

[msw, 2017-06-08 01:20:13]

The CQ bit was checked by msw@chromium.org

[msw, 2017-06-08 01:20:14]

The patchset sent to the CQ was uploaded after l-g-t-m from sky@chromium.org
Link to the patchset: https://codereview.chromium.org/2927693002/#ps80001
(title: "Disable WindowSelectorTest.MultipleDisplays in mash.")

[commit-bot: I haz the power, 2017-06-08 01:20:41]

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-06-08 01:54:07]

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

[commit-bot: I haz the power, 2017-06-08 01:54:09]

Try jobs failed on following builders:
  win_chromium_compile_dbg_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_comp...)

[msw, 2017-06-08 02:11:08]

The CQ bit was checked by msw@chromium.org

[commit-bot: I haz the power, 2017-06-08 02:11:32]

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-06-08 04:24:25]

CQ is committing da patch.

Bot data: {"patchset_id": 80001, "attempt_start_ts": 1496887868397880,
"parent_rev": "e974155892ab414b593094728883e70b4422a595", "commit_rev":
"feae432eb3cfeafbd4c30795171ac46462a23c80"}

[commit-bot: I haz the power, 2017-06-08 04:24:37]

Description was changed from

==========
mash: Limit ShelfWindowWatcher to panels and dialogs.

Chrome now syncs its own ShelfModel with Ash in Mash.
Avoid ShelfWindowWatcher and ChromeLauncherController clashing.
(ie. don't create SWW items for windows that CLC will handle)

Set TYPE_APP for extension and arc app windows to avoid SWW items.
Set TYPE_APP_PANEL in extension code; simplify
ChromeNativeAppWindowViewsAuraAsh.

Make SWW items for transient windows (per discussion w/oshima).
Only make SWW items for WINDOW_TYPE_NORMAL windows w/o a ShelfItemType.
(avoid making items for [transient] controls, popups, etc.)

Only make SWW items for visible windows (or minimized panels).
(clients set a ShelfItemType before Show() to avoid SWW items)
(fixes StatusAreaBubble, prior to WindowState::ignored_by_shelf)

Expand and refine ShelfWindowWatcher unit tests.
Fix simulated panel window creation in other unit tests.
Restore ExperimentalAppWindowApiTest.SetIcon to mash white lists.
Disable WindowSelectorTest.MultipleDisplays in mash for now.

TODO: Determine why OnAppWindowAdded is only called in Mash...

BUG=557406,679087,695562,729425,730759
TEST=Automated; chrome --mash doesn't crash opening the wallpaper picker.
R=sky@chromium.org
TBR=jamescook@chromium.org
==========

to

==========
mash: Limit ShelfWindowWatcher to panels and dialogs.

Chrome now syncs its own ShelfModel with Ash in Mash.
Avoid ShelfWindowWatcher and ChromeLauncherController clashing.
(ie. don't create SWW items for windows that CLC will handle)

Set TYPE_APP for extension and arc app windows to avoid SWW items.
Set TYPE_APP_PANEL in extension code; simplify
ChromeNativeAppWindowViewsAuraAsh.

Make SWW items for transient windows (per discussion w/oshima).
Only make SWW items for WINDOW_TYPE_NORMAL windows w/o a ShelfItemType.
(avoid making items for [transient] controls, popups, etc.)

Only make SWW items for visible windows (or minimized panels).
(clients set a ShelfItemType before Show() to avoid SWW items)
(fixes StatusAreaBubble, prior to WindowState::ignored_by_shelf)

Expand and refine ShelfWindowWatcher unit tests.
Fix simulated panel window creation in other unit tests.
Restore ExperimentalAppWindowApiTest.SetIcon to mash white lists.
Disable WindowSelectorTest.MultipleDisplays in mash for now.

TODO: Determine why OnAppWindowAdded is only called in Mash...

BUG=557406,679087,695562,729425,730759
TEST=Automated; chrome --mash doesn't crash opening the wallpaper picker.
R=sky@chromium.org
TBR=jamescook@chromium.org

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

[commit-bot: I haz the power, 2017-06-08 04:24:41]

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

[James Cook, 2017-06-08 17:14:00]

As you requested, a review while you're on vacation.

LGTM with the usual nits.

https://codereview.chromium.org/2927693002/diff/80001/ash/shelf/shelf_window_...
File ash/shelf/shelf_window_watcher.cc (right):

https://codereview.chromium.org/2927693002/diff/80001/ash/shelf/shelf_window_...
ash/shelf/shelf_window_watcher.cc:33: // Mash returns the dialog type for normal
windows without shelf item types.
nit: Explain why? Why is a normal window considered a dialog? I guess it's
because TYPE_DIALOG is ash::TYPE_DIALOG and there's no TYPE_NORMAL_WINDOW?

It might also help to make ShelfItemType into an enum class so things like
TYPE_DIALOG are not in such a large scope.

Or as Scott mentions, collapse some of these various window type
enums/constants. Frankly, I'd be OK with the aura layer knowing a little bit
about the various ash window types.

https://codereview.chromium.org/2927693002/diff/80001/ash/shelf/shelf_window_...
ash/shelf/shelf_window_watcher.cc:229: // ShelfWindowWatcher only handles panels
and dialogs for now, all other shelf
The division of responsibility between SWW and CLC confuses me. Consider
replicating this comment in the header.

https://codereview.chromium.org/2927693002/diff/80001/ash/shelf/shelf_window_...
File ash/shelf/shelf_window_watcher_unittest.cc (left):

https://codereview.chromium.org/2927693002/diff/80001/ash/shelf/shelf_window_...
ash/shelf/shelf_window_watcher_unittest.cc:203: // TODO: investigate failure in
mash. http://crbug.com/695562.
Woo hoo, things work in mash!

https://codereview.chromium.org/2927693002/diff/80001/ash/shelf/shelf_window_...
File ash/shelf/shelf_window_watcher_unittest.cc (right):

https://codereview.chromium.org/2927693002/diff/80001/ash/shelf/shelf_window_...
ash/shelf/shelf_window_watcher_unittest.cc:128: EXPECT_EQ(type ==
aura::client::WINDOW_TYPE_NORMAL ? 2 : 1,
nit: Take WINDOW_TYPE_NORMAL out of the array above and write a separate block
of test code for it. You might need a little helper function for the window
create. I find this conditional more confusing than a CreateTestWindow() helper.

https://codereview.chromium.org/2927693002/diff/80001/ash/shelf/shelf_window_...
ash/shelf/shelf_window_watcher_unittest.cc:321: // An item is created for a
panel window.
I think this test would be clearer if split into multiple smaller tests. Then I
wouldn't have to keep track of the 2 -> 3 -> 3 counts in my head.

https://codereview.chromium.org/2927693002/diff/80001/ash/shelf/shelf_window_...
ash/shelf/shelf_window_watcher_unittest.cc:393: EXPECT_EQ(2,
model_->item_count());
Hooray for explicit expectations instead of math in the test!

https://codereview.chromium.org/2927693002/diff/80001/chrome/browser/ui/ash/l...
File chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
(right):

https://codereview.chromium.org/2927693002/diff/80001/chrome/browser/ui/ash/l...
chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc:81:
// TODO(msw): Determine why this only seems to be called in Mash. Setting the
File a bug for this.

[James Cook, 2017-06-08 17:14:16]

As you requested, a review while you're on vacation.

LGTM with the usual nits.