(Merge to M-51) Revise the shelf alignment locking mechanism.

ash/ash.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # These files lists are shared with the GN build.
     'ash_sources': [
       'accelerators/accelerator_commands.cc',
@@ skipping 227 matching lines @@
       'shelf/shelf_delegate.h',
       'shelf/shelf_icon_observer.h',
       'shelf/shelf_item_delegate.h',
       'shelf/shelf_item_delegate_manager.cc',
       'shelf/shelf_item_delegate_manager.h',
       'shelf/shelf_item_types.cc',
       'shelf/shelf_item_types.h',
       'shelf/shelf_layout_manager.cc',
       'shelf/shelf_layout_manager.h',
       'shelf/shelf_layout_manager_observer.h',
+      'shelf/shelf_locking_manager.cc',
+      'shelf/shelf_locking_manager.h',
       'shelf/shelf_menu_model.h',
       'shelf/shelf_model.cc',
       'shelf/shelf_model.h',
       'shelf/shelf_model_observer.h',
       'shelf/shelf_navigator.cc',
       'shelf/shelf_navigator.h',
       'shelf/shelf_tooltip_manager.cc',
       'shelf/shelf_tooltip_manager.h',
       'shelf/shelf_types.h',
       'shelf/shelf_util.cc',
@@ skipping 459 matching lines @@
       'test/display_manager_test_api.cc',
       'test/display_manager_test_api.h',
       'test/mirror_window_test_api.cc',
       'test/mirror_window_test_api.h',
       'test/overflow_bubble_view_test_api.cc',
       'test/overflow_bubble_view_test_api.h',
       'test/shelf_button_pressed_metric_tracker_test_api.cc',
       'test/shelf_button_pressed_metric_tracker_test_api.h',
       'test/shelf_item_delegate_manager_test_api.cc',
       'test/shelf_item_delegate_manager_test_api.h',
-      'test/shelf_test_api.cc',
       'test/shelf_test_api.h',
       'test/shelf_view_test_api.cc',
       'test/shelf_view_test_api.h',
       'test/shell_test_api.cc',
       'test/shell_test_api.h',
       'test/status_area_widget_test_helper.cc',
       'test/status_area_widget_test_helper.h',
       'test/task_switch_time_tracker_test_api.cc',
       'test/task_switch_time_tracker_test_api.h',
       'test/test_activation_delegate.cc',
@@ skipping 635 matching lines @@
                   '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }],
   ],
 }