Restricting method and interface access in ChromeLauncherControllerImpl

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
index b8d8a2b536fc82d2c0754bd2e97f68d7abcf1d53..28d8f7d9d0d4a31fbde495e54616330d5fcbce7f 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
@@ -57,12 +57,12 @@ class ChromeLauncherControllerUserSwitchObserver;
 class ChromeLauncherControllerImpl
     : public ChromeLauncherController,
       public ash::ShelfDelegate,
-      public ash::ShelfModelObserver,
-      public ash::WindowTreeHostManager::Observer,
-      public AppIconLoaderDelegate,
-      public AppSyncUIStateObserver,
-      public LauncherAppUpdater::Delegate,
-      public ash::ShelfItemDelegateManagerObserver {
+      private ash::ShelfModelObserver,
+      private ash::WindowTreeHostManager::Observer,
+      private AppIconLoaderDelegate,
+      private AppSyncUIStateObserver,
+      private LauncherAppUpdater::Delegate,
+      private ash::ShelfItemDelegateManagerObserver {
  public:
   ChromeLauncherControllerImpl(Profile* profile, ash::ShelfModel* model);
   ~ChromeLauncherControllerImpl() override;
@@ -167,19 +167,6 @@ class ChromeLauncherControllerImpl
   bool IsAppPinned(const std::string& app_id) override;
   void UnpinAppWithID(const std::string& app_id) override;
 
-  // ash::ShelfItemDelegateManagerObserver:
-  void OnSetShelfItemDelegate(ash::ShelfID id,
-                              ash::ShelfItemDelegate* item_delegate) override;
-
-  // ash::ShelfModelObserver:
-  void ShelfItemAdded(int index) override;
-  void ShelfItemRemoved(int index, ash::ShelfID id) override;
-  void ShelfItemMoved(int start_index, int target_index) override;
-  void ShelfItemChanged(int index, const ash::ShelfItem& old_item) override;
-
-  // ash::WindowTreeHostManager::Observer:
-  void OnDisplayConfigurationChanged() override;
-
   // LauncherAppUpdater:

[msw, 2016/06/13 20:54:16]

Shouldn't this also be private to match the base class visibility? (nit: and the
actual base class is LauncherAppUpdater::Delegate)

[mfomitchev, 2016/06/13 20:58:33]

Changes inheritance of LauncherAppUpdater::Delegate to public (and fixed the
comment). We actually do use OnAppUpdated outside of this class.

   void OnAppInstalled(content::BrowserContext* browser_context,
                       const std::string& app_id) override;
@@ -188,15 +175,6 @@ class ChromeLauncherControllerImpl
   void OnAppUninstalled(content::BrowserContext* browser_context,
                         const std::string& app_id) override;
 
-  // AppSyncUIStateObserver:
-  void OnAppSyncUIStatusChanged() override;
-
-  // AppIconLoaderDelegate:
-  void OnAppImageUpdated(const std::string& app_id,
-                         const gfx::ImageSkia& image) override;
-
-
-
  protected:
   // Creates a new app shortcut item and controller on the shelf at |index|.
   // Use kInsertItemAtEnd to add a shortcut as the last item.
@@ -218,6 +196,7 @@ class ChromeLauncherControllerImpl
   friend class ChromeLauncherControllerImplTest;
   friend class ShelfAppBrowserTest;
   friend class LauncherPlatformAppBrowserTest;
+  FRIEND_TEST_ALL_PREFIXES(ChromeLauncherControllerImplTest, AppPanels);
 
   typedef std::map<ash::ShelfID, LauncherItemController*> IDToItemControllerMap;
   typedef std::map<content::WebContents*, std::string> WebContentsToAppIDMap;
@@ -330,6 +309,26 @@ class ChromeLauncherControllerImpl
 
   AppIconLoader* GetAppIconLoaderForApp(const std::string& app_id);
 
+  // ash::ShelfItemDelegateManagerObserver:
+  void OnSetShelfItemDelegate(ash::ShelfID id,
+                              ash::ShelfItemDelegate* item_delegate) override;
+
+  // ash::ShelfModelObserver:
+  void ShelfItemAdded(int index) override;
+  void ShelfItemRemoved(int index, ash::ShelfID id) override;
+  void ShelfItemMoved(int start_index, int target_index) override;
+  void ShelfItemChanged(int index, const ash::ShelfItem& old_item) override;
+
+  // ash::WindowTreeHostManager::Observer:
+  void OnDisplayConfigurationChanged() override;
+
+  // AppSyncUIStateObserver:
+  void OnAppSyncUIStatusChanged() override;
+
+  // AppIconLoaderDelegate:
+  void OnAppImageUpdated(const std::string& app_id,
+                         const gfx::ImageSkia& image) override;
+
   ash::ShelfModel* model_;
 
   ash::ShelfItemDelegateManager* item_delegate_manager_;