diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 23:02:07 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 23:02:07 +0000 |
| commit | 41ed4e87b6462632feee5f5fcd376cc23ecbc15d (patch) | |
| tree | 4c627407c06c7d09861c3bb744e1afa990197b83 /chrome/browser/intents | |
| parent | 9f47b5d47974d06ebbdaba0cfb6dc2abd5609f42 (diff) | |
| download | chromium_src-41ed4e87b6462632feee5f5fcd376cc23ecbc15d.zip chromium_src-41ed4e87b6462632feee5f5fcd376cc23ecbc15d.tar.gz chromium_src-41ed4e87b6462632feee5f5fcd376cc23ecbc15d.tar.bz2 | |
Revert 97966 : Revert 97955 - First pass on intents options UI.
Original review URL: http://codereview.chromium.org/7624012
R=groby@chromium.org,vandebo@chromium.org
BUG=none
TEST=*Intents*
Review URL: http://codereview.chromium.org/7719029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98340 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/intents')
| -rw-r--r-- | chrome/browser/intents/web_intents_registry.h | 1 | ||||
| -rw-r--r-- | chrome/browser/intents/web_intents_registry_factory.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/intents/web_intents_registry.h b/chrome/browser/intents/web_intents_registry.h index f5d724a..4b0f646 100644 --- a/chrome/browser/intents/web_intents_registry.h +++ b/chrome/browser/intents/web_intents_registry.h @@ -55,6 +55,7 @@ class WebIntentsRegistry // WebIntentsRegistry. friend class WebIntentsRegistryFactory; friend class WebIntentsRegistryTest; + friend class IntentsModelTest; WebIntentsRegistry(); virtual ~WebIntentsRegistry(); diff --git a/chrome/browser/intents/web_intents_registry_factory.h b/chrome/browser/intents/web_intents_registry_factory.h index 4827097..05ea36b8 100644 --- a/chrome/browser/intents/web_intents_registry_factory.h +++ b/chrome/browser/intents/web_intents_registry_factory.h @@ -18,7 +18,7 @@ class WebIntentsRegistry; class WebIntentsRegistryFactory : public ProfileKeyedServiceFactory { public: // Returns the WebIntentsRegistry that provides intent registration for - // |profile|. + // |profile|. Ownership stays with this factory object. static WebIntentsRegistry* GetForProfile(Profile* profile); // Returns the singleton instance of the WebIntentsRegistryFactory. |