Restricting method and interface access in ChromeLauncherControllerImpl

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

 // Copyright 2013 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_CHROME_LAUNCHER_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_
 
 #include <list>
 #include <memory>
 
@@ skipping 39 matching lines @@
 
 class ChromeLauncherControllerUserSwitchObserver;
 
 // Implementation of ChromeLauncherController, used for classic Ash.
 // In addition to implementing ChromeLauncherController, this class performs
 // a lot of other responsibilities, such as implementing ash::ShelfDelegate,
 // updating the UI state and the shelf model when apps are uninstalled, etc.
 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;
 
   // Create ChromeLauncherControllerImpl instance and set is as the
   // ChromeLauncherController singleton.
   static ChromeLauncherControllerImpl* CreateInstance(Profile* profile,
                                                       ash::ShelfModel* model);
 
   // ChromeLauncherController:
@@ skipping 84 matching lines @@
   void OnShelfAutoHideBehaviorChanged(ash::Shelf* shelf) override;
   void OnShelfAutoHideStateChanged(ash::Shelf* shelf) override;
   void OnShelfVisibilityStateChanged(ash::Shelf* shelf) override;
   ash::ShelfID GetShelfIDForAppID(const std::string& app_id) override;
   bool HasShelfIDToAppIDMapping(ash::ShelfID id) const override;
   const std::string& GetAppIDForShelfID(ash::ShelfID id) override;
   void PinAppWithID(const std::string& app_id) override;
   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;
   void OnAppUpdated(content::BrowserContext* browser_context,
                     const std::string& app_id) override;
   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.
   ash::ShelfID CreateAppShortcutLauncherItem(const std::string& app_id,
                                              int index);
 
   // Sets LauncherControllerHelper/AppIconLoader for test, taking ownership.
   void SetLauncherControllerHelperForTest(LauncherControllerHelper* helper);
   void SetAppIconLoadersForTest(
       std::vector<std::unique_ptr<AppIconLoader>>& loaders);
   const std::string& GetAppIdFromShelfIdForTest(ash::ShelfID id);
 
   // Sets the ash::ShelfItemDelegateManager only for unittests and doesn't
   // take an ownership of it.
   void SetShelfItemDelegateManagerForTest(
       ash::ShelfItemDelegateManager* manager);
 
  private:
   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;
 
   // Remembers / restores list of running applications.
   // Note that this order will neither be stored in the preference nor will it
   // remember the order of closed applications since it is only temporary.
   void RememberUnpinnedRunningApplicationOrder();
   void RestoreUnpinnedRunningApplicationOrder(const std::string& user_id);
 
@@ skipping 92 matching lines @@
                             ash::ShelfItemDelegate* item_delegate);
 
   // Attach to a specific profile.
   void AttachProfile(Profile* proifile);
 
   // Forget the current profile to allow attaching to a new one.
   void ReleaseProfile();
 
   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_;
 
   // Profile used for prefs and loading extensions. This is NOT necessarily the
   // profile new windows are created with.
   Profile* profile_;
 
   // Controller items in this map are owned by |ShelfItemDelegateManager|.
   IDToItemControllerMap id_to_item_controller_map_;
@@ skipping 35 matching lines @@
   // The list of running & un-pinned applications for different users on hidden
   // desktops.
   typedef std::vector<std::string> RunningAppListIds;
   typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;
   RunningAppListIdMap last_used_running_application_order_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_