Revert https://codereview.chromium.org/1060993003

chrome/browser/ui/webui/extensions/extension_settings_handler.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 66 matching lines @@
 
   // ExtensionManagement::Observer implementation.
   void OnExtensionManagementSettingsChanged() override;
 
   // WarningService::Observer implementation.
   void ExtensionWarningsChanged() override;
 
   // Helper method that reloads all unpacked extensions.
   void ReloadUnpackedExtensions();
 
-  // Callback for "extensionSettingsLaunch" message.
+  // Callback for "requestExtensionsData" message.
+  void HandleRequestExtensionsData(const base::ListValue* args);
+
+  // Callback for "toggleDeveloperMode" message.
+  void HandleToggleDeveloperMode(const base::ListValue* args);
+
+  // Callback for "launch" message.
   void HandleLaunchMessage(const base::ListValue* args);
 
-  // Callback for "extensionSettingsRepair" message.
+  // Callback for "repair" message.
   void HandleRepairMessage(const base::ListValue* args);
 
-  // Callback for "extensionSettingsOptions" message.
+  // Callback for "options" message.
   void HandleOptionsMessage(const base::ListValue* args);
 
-  // Callback for "extensionSettingsAutoupdate" message.
+  // Callback for "autoupdate" message.
   void HandleAutoUpdateMessage(const base::ListValue* args);
 
-  // Callback for the "extensionSettingsShowPath" message.
+  // Callback for the "showPath" message.
   void HandleShowPath(const base::ListValue* args);
 
-  // Callback for the "extensionSettingsRegister" message.
-  void HandleRegisterMessage(const base::ListValue* args);
-
   // Utility for callbacks that get an extension ID as the sole argument.
   // Returns NULL if the extension isn't active.
   const Extension* GetActiveExtension(const base::ListValue* args);
 
   // Forces a UI update if appropriate after a notification is received.
   void MaybeUpdateAfterNotification();
 
+  // Register for notifications that we need to reload the page.
+  void MaybeRegisterForNotifications();
+
   // Called when the reinstallation is complete.
   void OnReinstallComplete(bool success,
                            const std::string& error,
                            webstore_install::Result result);
 
   // Our model.  Outlives us since it's owned by our containing profile.
   ExtensionService* extension_service_;
 
   // If true, we will ignore notifications in ::Observe(). This is needed
   // to prevent reloading the page when we were the cause of the
   // notification.
   bool ignore_notifications_;
 
   // The page may be refreshed in response to a RenderViewHost being destroyed,
   // but the iteration over RenderViewHosts will include the host because the
   // notification is sent when it is in the process of being deleted (and before
   // it is removed from the process). Keep a pointer to it so we can exclude
   // it from the active views.
   content::RenderViewHost* deleting_rvh_;
   // Do the same for a deleting RenderWidgetHost ID and RenderProcessHost ID.
   int deleting_rwh_id_;
   int deleting_rph_id_;
 
+  // We want to register for notifications only after we've responded at least
+  // once to the page, otherwise we'd be calling JavaScript functions on objects
+  // that don't exist yet when notifications come in. This variable makes sure
+  // we do so only once.
+  bool registered_for_notifications_;
+
   content::NotificationRegistrar registrar_;
 
   ScopedObserver<WarningService, WarningService::Observer>
       warning_service_observer_;
 
   // An observer to listen for notable changes in the ExtensionPrefs, like
   // a change in Disable Reasons.
   ScopedObserver<ExtensionPrefs, ExtensionPrefsObserver>
       extension_prefs_observer_;
 
   ScopedObserver<ExtensionManagement, ExtensionManagement::Observer>
       extension_management_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsHandler);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_