[Extensions UI] Use developerPrivate API for profile configuration

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 cb9dfe559c0274f41c3dbb0a1b9a0a47434e5ab8..9171051917126f3ea1bb286e39962c6e518f7142 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -11,7 +11,6 @@
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
-#include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -24,11 +23,9 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_ui_util.h"
-#include "chrome/browser/extensions/install_verifier.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
 #include "chrome/browser/extensions/webstore_reinstaller.h"
 #include "chrome/browser/platform_util.h"
-#include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/apps/app_info_dialog.h"
 #include "chrome/browser/ui/browser.h"
@@ -89,7 +86,6 @@ ExtensionSettingsHandler::ExtensionSettingsHandler()
       deleting_rvh_(NULL),
       deleting_rwh_id_(-1),
       deleting_rph_id_(-1),
-      registered_for_notifications_(false),
       warning_service_observer_(this),
       extension_prefs_observer_(this),
       extension_management_observer_(this) {
@@ -319,12 +315,6 @@ void ExtensionSettingsHandler::RegisterMessages() {
   extension_service_ =
       extensions::ExtensionSystem::Get(profile)->extension_service();
 
-  web_ui()->RegisterMessageCallback("extensionSettingsRequestExtensionsData",
-      base::Bind(&ExtensionSettingsHandler::HandleRequestExtensionsData,
-                 AsWeakPtr()));
-  web_ui()->RegisterMessageCallback("extensionSettingsToggleDeveloperMode",
-      base::Bind(&ExtensionSettingsHandler::HandleToggleDeveloperMode,
-                 AsWeakPtr()));
   web_ui()->RegisterMessageCallback("extensionSettingsLaunch",
       base::Bind(&ExtensionSettingsHandler::HandleLaunchMessage,
                  AsWeakPtr()));
@@ -340,6 +330,9 @@ void ExtensionSettingsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("extensionSettingsShowPath",
       base::Bind(&ExtensionSettingsHandler::HandleShowPath,
                  AsWeakPtr()));
+  web_ui()->RegisterMessageCallback("extensionSettingsRegister",
+      base::Bind(&ExtensionSettingsHandler::HandleRegisterMessage,
+                 AsWeakPtr()));
 }
 
 void ExtensionSettingsHandler::Observe(
@@ -424,73 +417,6 @@ void ExtensionSettingsHandler::ReloadUnpackedExtensions() {
   }
 }
 
-void ExtensionSettingsHandler::HandleRequestExtensionsData(
-    const base::ListValue* args) {
-  // The items which are to be written into results are also described in
-  // chrome/browser/resources/extensions/extensions.js in @typedef for
-  // ExtensionDataResponse. Please update it whenever you add or remove any keys
-  // here.
-  base::DictionaryValue results;
-
-  Profile* profile = Profile::FromWebUI(web_ui());
-
-  bool is_supervised = profile->IsSupervised();
-  bool incognito_available =
-      IncognitoModePrefs::GetAvailability(profile->GetPrefs()) !=
-          IncognitoModePrefs::DISABLED;
-  bool developer_mode =
-      !is_supervised &&
-      profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode);
-  results.SetBoolean("profileIsSupervised", is_supervised);
-  results.SetBoolean("incognitoAvailable", incognito_available);
-  results.SetBoolean("developerMode", developer_mode);
-  results.SetBoolean("enableAppInfoDialog", CanShowAppInfoDialog());
-
-  const bool load_unpacked_disabled =
-      ExtensionManagementFactory::GetForBrowserContext(profile)
-          ->BlacklistedByDefault();
-  results.SetBoolean("loadUnpackedDisabled", load_unpacked_disabled);
-
-  web_ui()->CallJavascriptFunction(
-      "extensions.ExtensionSettings.returnExtensionsData", results);
-
-  MaybeRegisterForNotifications();
-
-  scoped_ptr<ExtensionSet> extensions =
-      ExtensionRegistry::Get(profile)->GenerateInstalledExtensionsSet(
-          ExtensionRegistry::ENABLED |
-          ExtensionRegistry::DISABLED |
-          ExtensionRegistry::TERMINATED);
-  ExtensionPrefs* prefs = ExtensionPrefs::Get(profile);
-  bool should_do_verification_check = false;
-  for (const scoped_refptr<const Extension>& extension : *extensions) {
-    if (ui_util::ShouldDisplayInExtensionSettings(extension.get(), profile)) {
-      int disable_reasons = prefs->GetDisableReasons(extension->id());
-      if ((disable_reasons & Extension::DISABLE_NOT_VERIFIED)) {
-        should_do_verification_check = true;
-        break;
-      }
-    }
-  }
-
-  UMA_HISTOGRAM_BOOLEAN("ExtensionSettings.ShouldDoVerificationCheck",
-                        should_do_verification_check);
-  if (should_do_verification_check)
-    ExtensionSystem::Get(profile)->install_verifier()->VerifyAllExtensions();
-}
-
-void ExtensionSettingsHandler::HandleToggleDeveloperMode(
-    const base::ListValue* args) {
-  Profile* profile = Profile::FromWebUI(web_ui());
-  if (profile->IsSupervised())
-    return;
-
-  bool developer_mode_on;
-  CHECK(args->GetBoolean(0, &developer_mode_on));
-  profile->GetPrefs()->SetBoolean(prefs::kExtensionsUIDeveloperMode,
-                                  developer_mode_on);
-}
-
 void ExtensionSettingsHandler::HandleLaunchMessage(
     const base::ListValue* args) {
   CHECK_EQ(1U, args->GetSize());
@@ -551,25 +477,8 @@ void ExtensionSettingsHandler::HandleShowPath(const base::ListValue* args) {
                                   extension->path().Append(kManifestFilename));
 }
 
-const Extension* ExtensionSettingsHandler::GetActiveExtension(
+void ExtensionSettingsHandler::HandleRegisterMessage(
     const base::ListValue* args) {

[Dan Beam, 2015/04/10 21:26:27]

if there a way to determine if this code path has ever been run without using a
bool |registered_for_notifications_|?

[Devlin, 2015/04/10 21:43:04]

I thought since it was moved to be only in ExtensionSettings initialize() (as
opposed to called every time we fetched data), that would serve as a guarantee. 
But I forgot that we keep around the webui even if the page is fully recreated,
as in the case of reloading.  Brought back the bool.

-  std::string extension_id = base::UTF16ToUTF8(ExtractStringValue(args));
-  CHECK(!extension_id.empty());
-  return extension_service_->GetExtensionById(extension_id, false);
-}
-
-void ExtensionSettingsHandler::MaybeUpdateAfterNotification() {
-  content::WebContents* contents = web_ui()->GetWebContents();
-  if (!ignore_notifications_ && contents && contents->GetRenderViewHost())
-    HandleRequestExtensionsData(NULL);
-  deleting_rvh_ = NULL;
-}
-
-void ExtensionSettingsHandler::MaybeRegisterForNotifications() {
-  if (registered_for_notifications_)
-    return;
-
-  registered_for_notifications_  = true;

[Dan Beam, 2015/04/10 21:26:27]

why'd you remove this?

[Devlin, 2015/04/10 21:43:04]

See other comment.

   Profile* profile = Profile::FromWebUI(web_ui());

[Dan Beam, 2015/04/10 21:48:02]

nit: instead of bringing back the bool

  auto* warning_service = WarningService::Get(profile);
  if (extension_management_observer_.IsObserving(warning_service))
    return;

[Devlin, 2015/04/10 21:54:09]

Sure, though I prefer registrar_.IsEmpty, since it saves us a keyed service look
up in the case of already being called. :)

 
   // Register for notifications that we need to reload the page.
@@ -608,6 +517,22 @@ void ExtensionSettingsHandler::MaybeRegisterForNotifications() {
   profile->GetPrefs()->ClearPref(prefs::kExtensionsUIDismissedADTPromo);
 }
 
+const Extension* ExtensionSettingsHandler::GetActiveExtension(
+    const base::ListValue* args) {
+  std::string extension_id = base::UTF16ToUTF8(ExtractStringValue(args));
+  CHECK(!extension_id.empty());
+  return extension_service_->GetExtensionById(extension_id, false);
+}
+
+void ExtensionSettingsHandler::MaybeUpdateAfterNotification() {
+  content::WebContents* contents = web_ui()->GetWebContents();
+  if (!ignore_notifications_ && contents && contents->GetRenderViewHost()) {
+    web_ui()->CallJavascriptFunction(
+        "extensions.ExtensionSettings.onExtensionsChanged");
+  }
+  deleting_rvh_ = NULL;
+}

[Dan Beam, 2015/04/10 21:26:27]

nit: next time mention you're only aligning with the header's declaration
ordering or do this separately.

[Devlin, 2015/04/10 21:43:04]

Will do, sorry.

+
 void ExtensionSettingsHandler::OnReinstallComplete(
     bool success,
     const std::string& error,