Fix overlapping of shelf options on supervised user creation page when rotating screen

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
index 929bc24ba6c919519d96de0d4ff9ed4a2ac2b931..55ad47efb4885f46c529a2024dfc19303f7d25f2 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
@@ -1669,6 +1669,12 @@ void ChromeLauncherControllerImpl::ShelfItemChanged(
 // ash::WindowTreeHostManager::Observer:
 
 void ChromeLauncherControllerImpl::OnDisplayConfigurationChanged() {
+  // In BOTTOM_LOCKED state, ignore the call of SetShelfBehaviorsFromPrefs.
+  // Because it might be called by some operations, like crbug.com/627040
+  // rotating screen.
+  ash::Shelf* shelf = ash::Shelf::ForPrimaryDisplay();
+  if (shelf && shelf->alignment() == ash::SHELF_ALIGNMENT_BOTTOM_LOCKED)
+    return;

[stevenjb, 2016/07/11 22:04:24]

nit: Normally we prefer early exit like this, however in this case since this is
a Changed() handler it might be better to invert the if and move
SetShelfBehaviorsFromPrefs() to the if body, that way if additional code gets
added to this handler it will still get called. (That said, anybody adding code
should notice and make the change, so this is also fine as-is).

[Qiang(Joe) Xu, 2016/07/11 22:27:52]

done. tks for this tip.

   SetShelfBehaviorsFromPrefs();
 }