| 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 2171031431daa0b8723ca0e40516a82df368226e..ae326625163863b11d43035ff707584ad8373e99 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
|
| @@ -227,8 +227,18 @@ class ChromeLauncherController
|
|
|
| Profile* profile() { return profile_; }
|
|
|
| - void SetAutoHideBehavior(ash::ShelfAutoHideBehavior behavior,
|
| - aura::RootWindow* root_window);
|
| + // Gets the shelf auto-hide behavior on |root_window|.
|
| + ash::ShelfAutoHideBehavior GetShelfAutoHideBehavior(
|
| + aura::RootWindow* root_window) const;
|
| +
|
| + // Returns |true| if the user is allowed to modify the shelf auto-hide
|
| + // behavior on |root_window|.
|
| + bool CanUserModifyShelfAutoHideBehavior(
|
| + aura::RootWindow* 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::RootWindow* root_window);
|
|
|
| // The tab no longer represents its previously identified application.
|
| void RemoveTabFromRunningApp(TabContents* tab, const std::string& app_id);
|
| @@ -311,6 +321,9 @@ class ChromeLauncherController
|
| // Re-syncs launcher model with prefs::kPinnedLauncherApps.
|
| void UpdateAppLaunchersFromPref();
|
|
|
| + void SetShelfAutoHideBehaviorPrefs(ash::ShelfAutoHideBehavior behavior,
|
| + aura::RootWindow* root_window);
|
| +
|
| // Sets the shelf auto-hide behavior from prefs.
|
| void SetShelfAutoHideBehaviorFromPrefs();
|
|
|
|
|