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

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

Issue 24076002: Disallowing shelf changes via drag & drop if the enterprise profile does not allow changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months 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.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index f26e21907bd30452b0a32d7a41667ae3adea4fbc..46d56cd06613cac7a2beb368a6bdb627f7124067 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -222,10 +222,6 @@ class ChromeLauncherController : public ash::LauncherDelegate,
// incognito window.
void CreateNewIncognitoWindow();
- // Checks whether the user is allowed to pin apps. Pinning may be disallowed
- // by policy in case there is a pre-defined set of pinned apps.
- bool CanPin() const;
-
// Updates the pinned pref state. The pinned state consists of a list pref.
// Each item of the list is a dictionary. The key |kAppIDPath| gives the
// id of the app.
@@ -276,6 +272,7 @@ class ChromeLauncherController : public ash::LauncherDelegate,
virtual const std::string& GetAppIDForLauncherID(ash::LauncherID id) OVERRIDE;
virtual void PinAppWithID(const std::string& app_id) OVERRIDE;
virtual bool IsAppPinned(const std::string& app_id) OVERRIDE;
+ virtual bool CanPin() const OVERRIDE;
virtual void UnpinAppWithID(const std::string& app_id) OVERRIDE;
// ash::LauncherItemDelegate overrides:

Powered by Google App Engine
This is Rietveld 408576698