diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 20:23:00 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 20:23:00 +0000 |
| commit | 3b6ea292868e9677ac4261235e7a8c82e1e177d8 (patch) | |
| tree | 8ab069faba9dfa5d636761bd7c974c66b15d284b /content | |
| parent | d38c5740cdfada7281f07a201dc01417511220a5 (diff) | |
| download | chromium_src-3b6ea292868e9677ac4261235e7a8c82e1e177d8.zip chromium_src-3b6ea292868e9677ac4261235e7a8c82e1e177d8.tar.gz chromium_src-3b6ea292868e9677ac4261235e7a8c82e1e177d8.tar.bz2 | |
[ChromeOS] Implement collected cookies in webui.
- Allow ConstrainedWindowGtkDelegate to specify whether it needs padding. And webui based one use no padding so that the padding could be controled from html side;
- Resurrected cookies_tree.js for the collected cookies UI and patched a bit so that we could have multiple instances in one html;
- Added CookiesTreeModelAdapter to work with the JS CookiesTree;
- Implemented the collected cookies UI in CollectedCookiesUIDelegate;
BUG=chromium-os:8134
TEST=Verify webui based cookie prompt work as expected.
Review URL: http://codereview.chromium.org/6644002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/webui/web_ui_factory.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/content/browser/webui/web_ui_factory.cc b/content/browser/webui/web_ui_factory.cc index 7468407..350d403 100644 --- a/content/browser/webui/web_ui_factory.cc +++ b/content/browser/webui/web_ui_factory.cc @@ -99,8 +99,10 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile, if (url.SchemeIs(chrome::kGearsScheme)) return &NewWebUI<HtmlDialogUI>; - if (url.host() == chrome::kChromeUIDialogHost) + if (url.host() == chrome::kChromeUIDialogHost || + url.host() == chrome::kChromeUICollectedCookiesHost) { return &NewWebUI<ConstrainedHtmlUI>; + } ExtensionService* service = profile ? profile->GetExtensionService() : NULL; if (service && service->ExtensionBindingsAllowed(url)) |