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

chrome/browser/ui/app_list/extension_app_model_builder.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/app_list/extension_app_model_builder.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/extensions/install_tracker_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/extension_app_item.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "ui/gfx/image/image_skia.h"
 
 using extensions::Extension;
 
 namespace {
 
 bool ShouldDisplayInAppLauncher(Profile* profile,
                                 scoped_refptr<const Extension> app) {
   // If it's the web store, check the policy.
   bool blocked_by_policy =
@@ skipping 95 matching lines @@
   SetHighlightedApp(extension_id);
 }
 
 void ExtensionAppModelBuilder::OnShutdown() {
   if (tracker_) {
     tracker_->RemoveObserver(this);
     tracker_ = NULL;
   }
 }
 
-void ExtensionAppModelBuilder::AddApps(const ExtensionSet* extensions,
-                                       ExtensionAppList* apps) {
-  for (ExtensionSet::const_iterator app = extensions->begin();
+void ExtensionAppModelBuilder::AddApps(
+    const extensions::ExtensionSet* extensions,
+    ExtensionAppList* apps) {
+  for (extensions::ExtensionSet::const_iterator app = extensions->begin();
        app != extensions->end(); ++app) {
     if (ShouldDisplayInAppLauncher(profile_, *app))
       apps->push_back(new ExtensionAppItem(profile_,
                                            (*app)->id(),
                                            "",
                                            gfx::ImageSkia(),
                                            (*app)->is_platform_app()));
   }
 }
 
 void ExtensionAppModelBuilder::BuildModel() {
   // Delete any extension apps.
   model_->item_list()->DeleteItemsByType(ExtensionAppItem::kAppType);
 
   if (tracker_)
     tracker_->RemoveObserver(this);
 
   tracker_ = controller_->GetInstallTrackerFor(profile_);
 
   PopulateApps();
   UpdateHighlight();
 
   // Start observing after model is built.
   if (tracker_)
     tracker_->AddObserver(this);
 }
 
 void ExtensionAppModelBuilder::PopulateApps() {
-  ExtensionSet extensions;
+  extensions::ExtensionSet extensions;
   controller_->GetApps(profile_, &extensions);
   ExtensionAppList apps;
   AddApps(&extensions, &apps);
 
   if (apps.empty())
     return;
 
   for (size_t i = 0; i < apps.size(); ++i)
     InsertApp(apps[i]);
 }
@@ skipping 61 matching lines @@
     app_list::AppListItemModel* item = item_list->item_at(idx + 1);
     if (item->GetAppType() == ExtensionAppItem::kAppType) {
       next = static_cast<ExtensionAppItem*>(item);
       break;
     }
   }
   // item->Move will call set_position, overriding the item's position.
   if (prev || next)
     static_cast<ExtensionAppItem*>(item)->Move(prev, next);
 }