summaryrefslogtreecommitdiffstats
path: root/chrome/browser/intents
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-21 03:02:34 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-21 03:02:34 +0000
commit1c321ee57a522e891d91a41a09bd900f0afd6f0d (patch)
treebb6e35526d52b50d8e37216e8605c7b4aa08c86a /chrome/browser/intents
parente2a374f50043586ff684e0720bbbd99b9aa15c07 (diff)
downloadchromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.zip
chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.gz
chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.bz2
Move Extension into extensions namespace
BUG=117262 TBR=aa@chromium.org Review URL: https://chromiumcodereview.appspot.com/10375021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/intents')
-rw-r--r--chrome/browser/intents/web_intents_registry.cc2
-rw-r--r--chrome/browser/intents/web_intents_registry.h6
-rw-r--r--chrome/browser/intents/web_intents_registry_unittest.cc1
3 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/intents/web_intents_registry.cc b/chrome/browser/intents/web_intents_registry.cc
index ff9c139..558d912 100644
--- a/chrome/browser/intents/web_intents_registry.cc
+++ b/chrome/browser/intents/web_intents_registry.cc
@@ -19,6 +19,8 @@
#include "googleurl/src/gurl.h"
#include "net/base/mime_util.h"
+using extensions::Extension;
+
namespace {
typedef WebIntentsRegistry::IntentServiceList IntentServiceList;
diff --git a/chrome/browser/intents/web_intents_registry.h b/chrome/browser/intents/web_intents_registry.h
index 2faa81c..7874e4f 100644
--- a/chrome/browser/intents/web_intents_registry.h
+++ b/chrome/browser/intents/web_intents_registry.h
@@ -16,6 +16,10 @@
struct DefaultWebIntentService;
+namespace extensions {
+class Extension;
+}
+
// Handles storing and retrieving of web intents services in the web database.
// The registry provides filtering logic to retrieve specific types of services.
class WebIntentsRegistry
@@ -107,7 +111,7 @@ class WebIntentsRegistry
void CollapseIntents(IntentServiceList* services);
private:
- const Extension* ExtensionForURL(const std::string& url);
+ const extensions::Extension* ExtensionForURL(const std::string& url);
struct IntentsQuery;
diff --git a/chrome/browser/intents/web_intents_registry_unittest.cc b/chrome/browser/intents/web_intents_registry_unittest.cc
index d1bc601..82673af 100644
--- a/chrome/browser/intents/web_intents_registry_unittest.cc
+++ b/chrome/browser/intents/web_intents_registry_unittest.cc
@@ -21,6 +21,7 @@
#include "testing/gtest/include/gtest/gtest.h"
using content::BrowserThread;
+using extensions::Extension;
using webkit_glue::WebIntentServiceData;
class MockExtensionService: public TestExtensionService {