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

Unified Diff: chrome/browser/apps/app_url_redirector.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
« no previous file with comments | « apps/app_restore_service.cc ('k') | chrome/browser/apps/shortcut_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/app_url_redirector.cc
diff --git a/chrome/browser/apps/app_url_redirector.cc b/chrome/browser/apps/app_url_redirector.cc
index 2588cd8eeb9fac637e26525b00f18c42671df6ab..cfa5ce238279084ad8693df6b6282959521ea0dc 100644
--- a/chrome/browser/apps/app_url_redirector.cc
+++ b/chrome/browser/apps/app_url_redirector.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/profiles/profile_io_data.h"
#include "chrome/common/extensions/api/url_handlers/url_handlers_parser.h"
#include "chrome/common/extensions/extension_messages.h"
-#include "chrome/common/extensions/extension_set.h"
#include "components/navigation_interception/intercept_navigation_resource_throttle.h"
#include "components/navigation_interception/navigation_params.h"
#include "content/public/browser/browser_thread.h"
@@ -21,6 +20,7 @@
#include "content/public/browser/web_contents.h"
#include "extensions/browser/info_map.h"
#include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
#include "net/url_request/url_request.h"
using content::BrowserThread;
@@ -101,9 +101,9 @@ AppUrlRedirector::MaybeCreateThrottleFor(net::URLRequest* request,
return NULL;
}
- const ExtensionSet& extensions =
+ const extensions::ExtensionSet& extensions =
profile_io_data->GetExtensionInfoMap()->extensions();
- for (ExtensionSet::const_iterator iter = extensions.begin();
+ for (extensions::ExtensionSet::const_iterator iter = extensions.begin();
iter != extensions.end();
++iter) {
const UrlHandlerInfo* handler =
« no previous file with comments | « apps/app_restore_service.cc ('k') | chrome/browser/apps/shortcut_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698