apps: Fix hit-testing when the app does not have any custom shape.

If an app window does not have any custom shape, then use the default window
targeter. Use ShapedAppWindowTargeter only if the app window has a valid shape.

BUG=338171
R=benwells@chromium.org

Review URL: https://codereview.chromium.org/147993002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247225 0039d316-1c4b-4281-b951-d872f2087c98
Reland again the patch "Manual profile reset: shortcuts on Windows" (https://codereview.chromium.org/137533010). It was reverted in https://codereview.chromium.org/146073004 because ProfileSettingsResetWebUITest.testOpenProfileSettingsReset timed out again.
This time I propagate CancellationFlag down to the lower layer. Thus, the whole task can be cancelled faster.

BUG=324931
TBR=jyasskin@chromium.org, dbeam@chromium.org, sky@chromium.org

Review URL: https://codereview.chromium.org/145503007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247226 0039d316-1c4b-4281-b951-d872f2087c98
Show the avatar batch in windows that are moved to another profile.

Windows that are moved to another profile should have the batch as well as
normal browser windows.

BUG=336091
TEST=manually

Review URL: https://codereview.chromium.org/148113002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247227 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 247227