diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 16:55:56 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 16:55:56 +0000 |
| commit | 1fd1a5043e4de3078e3e05684a14055474da0d0b (patch) | |
| tree | 25d28a7c713fd8bbda6e28bd599d4a890e6b3254 /chrome/browser/ui/browser_navigator.cc | |
| parent | 76b0f686facc70c33f2983c115933006654ee482 (diff) | |
| download | chromium_src-1fd1a5043e4de3078e3e05684a14055474da0d0b.zip chromium_src-1fd1a5043e4de3078e3e05684a14055474da0d0b.tar.gz chromium_src-1fd1a5043e4de3078e3e05684a14055474da0d0b.tar.bz2 | |
Move WebUIFactory to chrome/, try 2.
first try was r79691
This fixes the SiteInstance unit test failure. SiteInstance has all kinds of dependencies into chrome/. This fixes the unittest just enough to get it passing without trying to refactor SiteInstance at all.
BUG=77092
TEST=trybots, again
Review URL: http://codereview.chromium.org/6731060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_navigator.cc')
| -rw-r--r-- | chrome/browser/ui/browser_navigator.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index 36b53ca..86754f2 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -16,6 +16,7 @@ #include "chrome/browser/ui/status_bubble.h" #include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/webui/chrome_web_ui_factory.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "content/browser/site_instance.h" @@ -31,7 +32,7 @@ SiteInstance* GetSiteInstance(TabContents* source_contents, Profile* profile, // If url is a WebUI or extension, we need to be sure to use the right type // of renderer process up front. Otherwise, we create a normal SiteInstance // as part of creating the tab. - if (WebUIFactory::UseWebUIForURL(profile, url)) + if (ChromeWebUIFactory::GetInstance()->UseWebUIForURL(profile, url)) return SiteInstance::CreateSiteInstanceForURL(profile, url); if (!source_contents) |