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

Unified Diff: chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.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/fullscreen/fullscreen_exit_bubble_type.cc
diff --git a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc
index e8d34d72ba224b2c683829aad71355fef1836115..7cdfd61a70e34bfef294b1df2f0cc5987f5cbbff 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc
@@ -6,10 +6,10 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/common/extensions/extension_set.h"
#include "chrome/common/url_constants.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -20,7 +20,8 @@ base::string16 GetLabelTextForType(FullscreenExitBubbleType type,
ExtensionService* extension_service) {
base::string16 host(UTF8ToUTF16(url.host()));
if (extension_service) {
- const ExtensionSet* extensions = extension_service->extensions();
+ const extensions::ExtensionSet* extensions =
+ extension_service->extensions();
DCHECK(extensions);
const extensions::Extension* extension =
extensions->GetExtensionOrAppByURL(url);
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698