Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6278)

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h

Issue 11418114: Add policy for ash launcher auto-hide behavior (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed- Rebased. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h
index 8722d79ba2a7403043e7616336e9b91ff71dbb9a..994770f36e6746f9b3684d7f9dfc63d35ea4af65 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h
@@ -191,8 +191,19 @@ class ChromeLauncherControllerPerApp
virtual Profile* profile() OVERRIDE;
- virtual void SetAutoHideBehavior(ash::ShelfAutoHideBehavior behavior,
- aura::RootWindow* root_window) OVERRIDE;
+ // Gets the shelf auto-hide behavior on |root_window|.
+ virtual ash::ShelfAutoHideBehavior GetShelfAutoHideBehavior(
+ aura::RootWindow* root_window) const OVERRIDE;
+
+ // Returns |true| if the user is allowed to modify the shelf auto-hide
+ // behavior on |root_window|.
+ virtual bool CanUserModifyShelfAutoHideBehavior(
+ aura::RootWindow* root_window) const OVERRIDE;
+
+ // Toggles the shelf auto-hide behavior on |root_window|. Does nothing if the
+ // user is not allowed to modify the auto-hide behavior.
+ virtual void ToggleShelfAutoHideBehavior(
+ aura::RootWindow* root_window) OVERRIDE;
// The tab no longer represents its previously identified application.
virtual void RemoveTabFromRunningApp(TabContents* tab,
@@ -287,6 +298,10 @@ class ChromeLauncherControllerPerApp
// Re-syncs launcher model with prefs::kPinnedLauncherApps.
void UpdateAppLaunchersFromPref();
+ // Persists the shelf auto-hide behavior to prefs.
+ void SetShelfAutoHideBehaviorPrefs(ash::ShelfAutoHideBehavior behavior,
+ aura::RootWindow* root_window);
+
// Sets the shelf auto-hide behavior from prefs.
void SetShelfAutoHideBehaviorFromPrefs();

Powered by Google App Engine
This is Rietveld 408576698