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

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

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.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index 4fb9cddadf53eb7b2507c6d2a15bf265e8df946b..193f5f853d4921a408a21ece6014343694674840 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -631,6 +631,12 @@ void ChromeLauncherController::SetLauncherItemImage(
model_->Set(index, item);
}
+bool ChromeLauncherController::CanPin() const {
+ const PrefService::Preference* pref =
+ profile_->GetPrefs()->FindPreference(prefs::kPinnedLauncherApps);
+ return pref && pref->IsUserModifiable();
+}
+
bool ChromeLauncherController::IsAppPinned(const std::string& app_id) {
for (IDToItemControllerMap::const_iterator i =
id_to_item_controller_map_.begin();
@@ -689,12 +695,6 @@ void ChromeLauncherController::CreateNewIncognitoWindow() {
chrome::HOST_DESKTOP_TYPE_ASH);
}
-bool ChromeLauncherController::CanPin() const {
- const PrefService::Preference* pref =
- profile_->GetPrefs()->FindPreference(prefs::kPinnedLauncherApps);
- return pref && pref->IsUserModifiable();
-}
-
void ChromeLauncherController::PersistPinnedState() {
if (ignore_persist_pinned_state_change_)
return;

Powered by Google App Engine
This is Rietveld 408576698