Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1059)

Unified Diff: chrome/browser/ui/gtk/script_bubble_gtk.cc

Issue 102103005: Move c/c/e/extension_set to top-level extensions/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/script_bubble_gtk.cc
diff --git a/chrome/browser/ui/gtk/script_bubble_gtk.cc b/chrome/browser/ui/gtk/script_bubble_gtk.cc
index 600f07b8b5899c69ccec427b0cd0a760f1f2dc75..27740960c4a11dd9489a6d86ad215f3dcbf5e9b8 100644
--- a/chrome/browser/ui/gtk/script_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/script_bubble_gtk.cc
@@ -16,11 +16,11 @@
#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"
@@ -88,7 +88,7 @@ void ScriptBubbleGtk::BuildBubble() {
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 =
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/ui/sync/profile_signin_confirmation_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698