Let ModeIndicator ignore the shelf-space.

BUG=340348
R=nona@chromium.org
TEST=manually

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250538 0039d316-1c4b-4281-b951-d872f2087c98
Some minor window state replacements

BUG=337563
TEST=none

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

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