Move c/c/e/extension_set to top-level extensions/

chrome/browser/ui/webui/ntp/app_launcher_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/ntp/app_launcher_handler.h"
 
 #include <vector>
 
 #include "apps/metrics_names.h"
 #include "base/auto_reset.h"
@@ skipping 33 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/web_application_info.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/favicon_url.h"
 #include "extensions/browser/app_sorting.h"
 #include "extensions/browser/management_policy.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/gfx/favicon_size.h"
 #include "url/gurl.h"
 
 using content::WebContents;
 using extensions::AppSorting;
 using extensions::CrxInstaller;
@@ skipping 354 matching lines @@
   // a) At that point in time, depending on the pref that changed, it can look
   //    like the set of apps installed has changed, and we will mark the promo
   //    expired.
   // b) Conceptually, it doesn't really make sense to count a
   //    prefchange-triggered refresh as a promo 'view'.
   Profile* profile = Profile::FromWebUI(web_ui());
 
   // The first time we load the apps we must add all current app to the list
   // of apps visible on the NTP.
   if (!has_loaded_apps_) {
-    const ExtensionSet* extensions = extension_service_->extensions();
-    for (ExtensionSet::const_iterator it = extensions->begin();
+    const extensions::ExtensionSet* extensions =
+        extension_service_->extensions();
+    for (extensions::ExtensionSet::const_iterator it = extensions->begin();
          it != extensions->end(); ++it) {
       visible_apps_.insert((*it)->id());
     }
 
     extensions = extension_service_->disabled_extensions();
-    for (ExtensionSet::const_iterator it = extensions->begin();
+    for (extensions::ExtensionSet::const_iterator it = extensions->begin();
          it != extensions->end(); ++it) {
       visible_apps_.insert((*it)->id());
     }
 
     extensions = extension_service_->terminated_extensions();
-    for (ExtensionSet::const_iterator it = extensions->begin();
+    for (extensions::ExtensionSet::const_iterator it = extensions->begin();
          it != extensions->end(); ++it) {
       visible_apps_.insert((*it)->id());
     }
   }
 
   SetAppToBeHighlighted();
   FillAppDictionary(&dictionary);
   web_ui()->CallJavascriptFunction("ntp.getAppsCallback", dictionary);
 
   // First time we get here we set up the observer so that we can tell update
@@ skipping 387 matching lines @@
 ExtensionUninstallDialog* AppLauncherHandler::GetExtensionUninstallDialog() {
   if (!extension_uninstall_dialog_.get()) {
     Browser* browser = chrome::FindBrowserWithWebContents(
         web_ui()->GetWebContents());
     extension_uninstall_dialog_.reset(
         ExtensionUninstallDialog::Create(extension_service_->profile(),
                                          browser, this));
   }
   return extension_uninstall_dialog_.get();
 }