[ash] Add TYPE_DIALOG and its item's LauncherContextMenu

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index 9d78b3777119dcd87d7ea3436bcebce591aa0f50..5bccdf269df75ba0d514966722a7286f4f2b3fc6 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -258,10 +258,6 @@ class ChromeLauncherController : public ash::ShelfDelegate,
   ash::ShelfAutoHideBehavior GetShelfAutoHideBehavior(
       aura::Window* root_window) const;
 
-  // Returns |true| if the user is allowed to modify the shelf auto-hide
-  // behavior on |root_window|.
-  bool CanUserModifyShelfAutoHideBehavior(aura::Window* root_window) const;
-
   // Toggles the shelf auto-hide behavior on |root_window|. Does nothing if the
   // user is not allowed to modify the auto-hide behavior.
   void ToggleShelfAutoHideBehavior(aura::Window* root_window);
@@ -300,6 +296,8 @@ class ChromeLauncherController : public ash::ShelfDelegate,
   virtual bool IsAppPinned(const std::string& app_id) OVERRIDE;
   virtual bool CanPin() const OVERRIDE;
   virtual void UnpinAppWithID(const std::string& app_id) OVERRIDE;
+  virtual bool CanUserModifyShelfAutoHideBehavior(
+      aura::Window* root_window) const OVERRIDE;
 
   // ash::ShelfModelObserver overrides:
   virtual void ShelfItemAdded(int index) OVERRIDE;