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

chrome/browser/ui/gtk/script_bubble_gtk.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/gtk/script_bubble_gtk.h"
 
 #include <string>
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/extensions/script_bubble_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::WebContents;
 using content::OpenURLParams;
 using content::Referrer;
 using extensions::Extension;
@@ skipping 47 matching lines @@
   GtkThemeService* theme_provider = GtkThemeService::GetFrom(profile_);
 
   GtkWidget* bubble_content = gtk_vbox_new(FALSE, ui::kControlSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(bubble_content),
                                  ui::kContentAreaBorder);
 
   extensions::TabHelper* tab_helper =
       extensions::TabHelper::FromWebContents(web_contents_);
   const std::set<std::string>& extensions_running_scripts =
       tab_helper->script_bubble_controller()->extensions_running_scripts();
-  const ExtensionSet* loaded_extensions =
+  const extensions::ExtensionSet* loaded_extensions =
       ExtensionSystem::Get(profile_)->extension_service()->extensions();
 
   std::string heading_string =
       l10n_util::GetStringUTF8(IDS_SCRIPT_BUBBLE_HEADLINE);
   GtkWidget* heading = gtk_label_new(heading_string.c_str());
   gtk_misc_set_alignment(GTK_MISC(heading), 0, 0);
   gtk_box_pack_start(GTK_BOX(bubble_content), heading, FALSE, FALSE, 0);
 
   for (std::set<std::string>::const_iterator iter =
            extensions_running_scripts.begin();
@@ skipping 54 matching lines @@
 void ScriptBubbleGtk::OnItemLinkClicked(GtkWidget* button) {
   std::string link(chrome::kChromeUIExtensionsURL);
   link += "?id=" + link_controls_[button];
   web_contents_->OpenURL(OpenURLParams(GURL(link),
                                        Referrer(),
                                        NEW_FOREGROUND_TAB,
                                        content::PAGE_TRANSITION_LINK,
                                        false));
   Close();
 }