summaryrefslogtreecommitdiffstats
path: root/chrome/browser/notifications
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 16:55:56 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 16:55:56 +0000
commit1fd1a5043e4de3078e3e05684a14055474da0d0b (patch)
tree25d28a7c713fd8bbda6e28bd599d4a890e6b3254 /chrome/browser/notifications
parent76b0f686facc70c33f2983c115933006654ee482 (diff)
downloadchromium_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/notifications')
-rw-r--r--chrome/browser/notifications/balloon_host.cc3
-rw-r--r--chrome/browser/notifications/balloon_host.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/notifications/balloon_host.cc b/chrome/browser/notifications/balloon_host.cc
index f5a824e..e105b3c 100644
--- a/chrome/browser/notifications/balloon_host.cc
+++ b/chrome/browser/notifications/balloon_host.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/renderer_host/browser_render_process_host.h"
#include "chrome/browser/renderer_preferences_util.h"
+#include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
#include "chrome/common/bindings_policy.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
@@ -147,7 +148,7 @@ void BalloonHost::CreateNewWindow(
route_id,
balloon_->profile(),
site_instance_.get(),
- WebUIFactory::GetWebUIType(balloon_->profile(),
+ ChromeWebUIFactory::GetInstance()->GetWebUIType(balloon_->profile(),
balloon_->notification().content_url()),
this,
params.window_container_type,
diff --git a/chrome/browser/notifications/balloon_host.h b/chrome/browser/notifications/balloon_host.h
index d00fbf9..475d6bd 100644
--- a/chrome/browser/notifications/balloon_host.h
+++ b/chrome/browser/notifications/balloon_host.h
@@ -9,6 +9,7 @@
#include <string>
#include <vector>
+#include "base/scoped_ptr.h"
#include "chrome/browser/extensions/extension_function_dispatcher.h"
#include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
#include "content/browser/renderer_host/render_view_host_delegate.h"