Show managed mode warning banner on chrome://extensions when the profile is managed instead of when…

Show managed mode warning banner on chrome://extensions when the profile is managed instead of when managed mode is active, and update the string accordingly.


BUG=169819
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=181915

[Bernhard Bauer, 2013-02-07 14:03:22]

Please review.

[Evan Stade, 2013-02-11 01:29:06]

lgtm

[commit-bot: I haz the power, 2013-02-11 06:40:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bauerb@chromium.org/12225052/1

[commit-bot: I haz the power, 2013-02-11 06:40:13]

Failed to apply patch for
chrome/browser/ui/webui/extensions/extension_settings_handler.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/webui/extensions/extension_settings_handler.cc
  Hunk #1 FAILED at 31.
  Hunk #2 succeeded at 70 (offset 1 line).
  Hunk #3 succeeded at 583 (offset 3 lines).
  Hunk #4 succeeded at 610 (offset 3 lines).
  Hunk #5 succeeded at 922 (offset 3 lines).
  1 out of 5 hunks FAILED -- saving rejects to file
chrome/browser/ui/webui/extensions/extension_settings_handler.cc.rej

Patch:       chrome/browser/ui/webui/extensions/extension_settings_handler.cc
Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index
dd517f797614e3941cc3eadcbc7acd01e3c402c4..027a8ccafd293e14e78d2dfe14fef2ca502aaf6f
100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -31,7 +31,6 @@
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/managed_mode/managed_mode.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/background_contents.h"
@@ -69,6 +68,11 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+#if defined(ENABLE_MANAGED_USERS)
+#include "chrome/browser/managed_mode/managed_user_service.h"
+#include "chrome/browser/managed_mode/managed_user_service_factory.h"
+#endif
+
 using content::RenderViewHost;
 using content::WebContents;
 using extensions::Extension;
@@ -575,16 +579,13 @@ void
ExtensionSettingsHandler::HandleRequestExtensionsData(
   }
   results.Set("extensions", extensions_list);
 
-  if (ManagedMode::IsInManagedMode()) {
-    results.SetBoolean("managedMode", true);
-    results.SetBoolean("developerMode", false);
-  } else {
-    results.SetBoolean("managedMode", false);
-
-    bool developer_mode =
-        profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode);
-    results.SetBoolean("developerMode", developer_mode);
-  }
+  bool is_managed =
+      ManagedUserServiceFactory::GetForProfile(profile)->ProfileIsManaged();
+  bool developer_mode =
+      !is_managed &&
+      profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode);
+  results.SetBoolean("profileIsManaged", is_managed);
+  results.SetBoolean("developerMode", developer_mode);
 
   // Check to see if we have any wiped out extensions.
   ExtensionService* extension_service =
@@ -605,11 +606,11 @@ void
ExtensionSettingsHandler::HandleRequestExtensionsData(
 }
 
 void ExtensionSettingsHandler::HandleToggleDeveloperMode(
-      const ListValue* args) {
-  if (ManagedMode::IsInManagedMode())
+    const ListValue* args) {
+  Profile* profile = Profile::FromWebUI(web_ui());
+  if (ManagedUserServiceFactory::GetForProfile(profile)->ProfileIsManaged())
     return;
 
-  Profile* profile = Profile::FromWebUI(web_ui());
   bool developer_mode =
       profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode);
   profile->GetPrefs()->SetBoolean(
@@ -917,8 +918,6 @@ void
ExtensionSettingsHandler::MaybeRegisterForNotifications() {
 
   pref_registrar_.Init(profile->GetPrefs());
   pref_registrar_.Add(prefs::kExtensionInstallDenyList, callback);
-  local_state_pref_registrar_.Init(g_browser_process->local_state());
-  local_state_pref_registrar_.Add(prefs::kInManagedMode, callback);
 }
 
 std::vector<ExtensionPage>

[commit-bot: I haz the power, 2013-02-11 14:47:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bauerb@chromium.org/12225052/5001

[commit-bot: I haz the power, 2013-02-11 14:47:53]

Presubmit check for 12225052-5001 failed and returned exit status 1.

INFO:root:Found 9 file(s).

Running presubmit commit checks ...
Running /b/commit-queue/workdir/chromium/PRESUBMIT.py
Running /b/commit-queue/workdir/chromium/chrome/PRESUBMIT.py
Running /b/commit-queue/workdir/chromium/chrome/browser/resources/PRESUBMIT.py
Running /b/commit-queue/workdir/chromium/chrome/browser/ui/webui/PRESUBMIT.py

** Presubmit ERRORS **
Missing LGTM from an OWNER for files in these directories:
    chrome/browser/profiles

Presubmit checks took 6.3s to calculate.

[commit-bot: I haz the power, 2013-02-11 14:58:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bauerb@chromium.org/12225052/6007

[commit-bot: I haz the power, 2013-02-11 17:44:39]

Retried try job too often on linux_chromeos for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-02-11 20:11:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bauerb@chromium.org/12225052/6007

[commit-bot: I haz the power, 2013-02-11 23:01:54]

Retried try job too often on linux_chromeos for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-02-12 08:41:30]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bauerb@chromium.org/12225052/6007

[commit-bot: I haz the power, 2013-02-12 13:01:43]

Change committed as 181915