diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 01:42:31 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 01:42:31 +0000 |
commit | d6ef7684df0f0699bbeb5baceb69998fecd2c36d (patch) | |
tree | 986df4b654309cfabefbc778bd2f8665b3d8b5ba /chrome/browser/chrome_content_browser_client.cc | |
parent | bd132983c14c2bc63098578027c9596b397f9f4e (diff) | |
download | chromium_src-d6ef7684df0f0699bbeb5baceb69998fecd2c36d.zip chromium_src-d6ef7684df0f0699bbeb5baceb69998fecd2c36d.tar.gz chromium_src-d6ef7684df0f0699bbeb5baceb69998fecd2c36d.tar.bz2 |
Revert 175890: actually, looks like we want this to also help move chromeos webui pages out of src/chrome.
> Revert 175822
>
> After more investigation of what it would take to share the webui code framework from chrome with content, it didn't seam feasible to do this. The code in chrome (i.e. ChromeURLDataManager) is heavily tied to chrome, and is used by chrome for non-webui stuff. The JS code is also specific to Chrome. It seems better to not bring in all this stuff to content.
>
> > Allow multiple WebUIControllerFactory objects to be registered. This makes is possible to implement webui inside content.
> > Review URL: https://codereview.chromium.org/11783038
>
> TBR=jam@chromium.org
> Review URL: https://codereview.chromium.org/11818036
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/11819050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175971 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_content_browser_client.cc')
-rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 53ab0ed..475e3cd 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -625,11 +625,6 @@ void ChromeContentBrowserClient::RenderProcessHostCreated( #endif } -content::WebUIControllerFactory* - ChromeContentBrowserClient::GetWebUIControllerFactory() { - return ChromeWebUIControllerFactory::GetInstance(); -} - GURL ChromeContentBrowserClient::GetEffectiveURL( content::BrowserContext* browser_context, const GURL& url) { Profile* profile = Profile::FromBrowserContext(browser_context); |