Convert ExtensionSettingsHandler to use the new navigation callbacks.

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

 // 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.
 
 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
 
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/apps/app_info_dialog.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/strings/grit/components_strings.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/manifest.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 239 matching lines @@
   source->AddString("extensionCommandsRegular",
       l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_NOT_GLOBAL));
   source->AddString("ok", l10n_util::GetStringUTF16(IDS_OK));
 
   // 'Bubble' text for the controlled-setting-indicator
   source->AddString(
       "extensionControlledSettingPolicy",
       l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));
 }
 
-void ExtensionSettingsHandler::DidStartNavigationToPendingEntry(
-    const GURL& url,
-    content::ReloadType reload_type) {
-  if (reload_type != content::ReloadType::NONE)
+void ExtensionSettingsHandler::DidStartNavigation(
+    content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->IsInMainFrame())
+    return;
+
+  if (navigation_handle->GetReloadType() != content::ReloadType::NONE)
     ReloadUnpackedExtensions();
 }
 
 void ExtensionSettingsHandler::RegisterMessages() {
   Profile* profile = Profile::FromWebUI(web_ui())->GetOriginalProfile();
   extension_service_ =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   // Clear the preference for the ADT Promo before fully removing it.
   // TODO(devlin): Take this out when everyone's been updated.
   Profile::FromWebUI(web_ui())->GetPrefs()->ClearPref(
@@ skipping 12 matching lines @@
       unpacked_extensions.push_back(extension.get());
   }
 
   for (std::vector<const Extension*>::iterator iter =
        unpacked_extensions.begin(); iter != unpacked_extensions.end(); ++iter) {
     extension_service_->ReloadExtensionWithQuietFailure((*iter)->id());
   }
 }
 
 }  // namespace extensions