[Merge-M54] Fix possible overlapping icons in shelf on sync.

chrome/browser/ui/ash/launcher/launcher_item_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <string>
 
 #include "ash/common/shelf/shelf_item_delegate.h"
@@ skipping 41 matching lines @@
   ChromeLauncherController* launcher_controller() const {
     return launcher_controller_;
   }
 
   // Lock this item to the launcher without being pinned (windowed v1 apps).
   void lock() { locked_++; }
   void unlock() {
     DCHECK(locked_);
     locked_--;
   }
-  bool locked() { return locked_ > 0; }
+  bool locked() const { return locked_ > 0; }
 
   bool image_set_by_controller() const { return image_set_by_controller_; }
   void set_image_set_by_controller(bool image_set_by_controller) {
     image_set_by_controller_ = image_set_by_controller;
   }
 
   // Returns true if this item is open.
   virtual bool IsOpen() const = 0;
 
   // Returns true if this item is visible (e.g. not minimized).
@@ skipping 25 matching lines @@
   // applications.
   int locked_;
 
   // Set to true if the launcher item image has been set by the controller.
   bool image_set_by_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_