diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 01:11:41 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 01:11:41 +0000 |
| commit | 214b81d70ec2a3eb09e381f7f306c651affd918b (patch) | |
| tree | bdd252488d5e16af779121d70876376e67e9abbd /chrome/browser/intents | |
| parent | 083bac6bb70ed7d18c25d40112c0ae0431575a35 (diff) | |
| download | chromium_src-214b81d70ec2a3eb09e381f7f306c651affd918b.zip chromium_src-214b81d70ec2a3eb09e381f7f306c651affd918b.tar.gz chromium_src-214b81d70ec2a3eb09e381f7f306c651affd918b.tar.bz2 | |
Revert 97955 - 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
TBR=gbillock@chromium.org
Review URL: http://codereview.chromium.org/7717016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97966 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, 1 insertions, 2 deletions
diff --git a/chrome/browser/intents/web_intents_registry.h b/chrome/browser/intents/web_intents_registry.h index 4b0f646..f5d724a 100644 --- a/chrome/browser/intents/web_intents_registry.h +++ b/chrome/browser/intents/web_intents_registry.h @@ -55,7 +55,6 @@ 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 05ea36b8..4827097 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|. Ownership stays with this factory object. + // |profile|. static WebIntentsRegistry* GetForProfile(Profile* profile); // Returns the singleton instance of the WebIntentsRegistryFactory. |