diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 00:32:29 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 00:32:29 +0000 |
| commit | 7c233302e1f674178b5da4b40ca1ff8c2b80fe7b (patch) | |
| tree | 2a2a9759987c6eeb7896483ee7519a09775dc009 /chrome/browser/intents | |
| parent | 7529fa0d91b4c70c87d4306077d1cdee6f8370a2 (diff) | |
| download | chromium_src-7c233302e1f674178b5da4b40ca1ff8c2b80fe7b.zip chromium_src-7c233302e1f674178b5da4b40ca1ff8c2b80fe7b.tar.gz chromium_src-7c233302e1f674178b5da4b40ca1ff8c2b80fe7b.tar.bz2 | |
First pass on intents options UI.
Copies the cookies view handler for intents.
Add pass-throughs to grit for flag.
Optionalize intents options page JS/CSS.
Fix up data model to read title. Working test.
R=jhawkins@chromium.org
BUG=None
TEST=*Intents*
Review URL: http://codereview.chromium.org/7624012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97955 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. |