summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/cocoa/notifications/balloon_controller.mm14
-rw-r--r--chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h8
-rw-r--r--chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.mm16
-rw-r--r--chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc9
-rw-r--r--chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc19
-rw-r--r--chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h7
-rw-r--r--chrome/browser/ui/views/notifications/balloon_view.cc15
-rw-r--r--chrome/browser/ui/views/notifications/balloon_view_host.cc45
-rw-r--r--chrome/browser/ui/views/notifications/balloon_view_host.h7
9 files changed, 45 insertions, 95 deletions
diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm
index b45838d..b5ebab8 100644
--- a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm
+++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm
@@ -19,6 +19,7 @@
#import "chrome/browser/ui/cocoa/notifications/balloon_view.h"
#include "chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h"
#include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/tab_contents/tab_contents.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -174,9 +175,11 @@ const int kRightMargin = 2;
- (void)updateContents {
DCHECK(htmlContents_.get()) << "BalloonView::Update called before Show";
- if (htmlContents_->render_view_host())
- htmlContents_->render_view_host()->NavigateToURL(
- balloon_->notification().content_url());
+ if (htmlContents_->tab_contents()) {
+ htmlContents_->tab_contents()->controller().LoadURL(
+ balloon_->notification().content_url(), GURL(),
+ content::PAGE_TRANSITION_LINK, std::string());
+ }
}
- (void)repositionToBalloon {
@@ -186,11 +189,10 @@ const int kRightMargin = 2;
int w = [self desiredTotalWidth];
int h = [self desiredTotalHeight];
+ [[self window] setFrame:NSMakeRect(x, y, w, h)
+ display:YES];
if (htmlContents_.get())
htmlContents_->UpdateActualSize(balloon_->content_size());
-
- [[[self window] animator] setFrame:NSMakeRect(x, y, w, h)
- display:YES];
}
// Returns the total width the view should be to accommodate the balloon.
diff --git a/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h b/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h
index 4d87466..43096ee 100644
--- a/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h
+++ b/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h
@@ -27,15 +27,7 @@ class BalloonViewHost : public BalloonHost {
// Accessors.
gfx::NativeView native_view() const;
- protected:
- virtual void InitRenderWidgetHostView();
- virtual RenderWidgetHostView* render_widget_host_view() const;
-
private:
- // The Mac-specific widget host view. This is owned by its native view,
- // which this class frees in its destructor.
- RenderWidgetHostViewMac* render_widget_host_view_;
-
DISALLOW_COPY_AND_ASSIGN(BalloonViewHost);
};
diff --git a/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.mm b/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.mm
index 4fad1c0..4d71835 100644
--- a/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.mm
+++ b/chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.mm
@@ -6,6 +6,8 @@
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/render_widget_host_view_mac.h"
+#include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/tab_contents/tab_contents_view.h"
BalloonViewHost::BalloonViewHost(Balloon* balloon)
: BalloonHost(balloon) {
@@ -16,7 +18,8 @@ BalloonViewHost::~BalloonViewHost() {
}
void BalloonViewHost::UpdateActualSize(const gfx::Size& new_size) {
- NSView* view = render_widget_host_view_->native_view();
+ tab_contents_->view()->SizeContents(new_size);
+ NSView* view = native_view();
NSRect frame = [view frame];
frame.size.width = new_size.width();
frame.size.height = new_size.height();
@@ -26,14 +29,5 @@ void BalloonViewHost::UpdateActualSize(const gfx::Size& new_size) {
}
gfx::NativeView BalloonViewHost::native_view() const {
- return render_widget_host_view_->native_view();
-}
-
-void BalloonViewHost::InitRenderWidgetHostView() {
- DCHECK(render_view_host_);
- render_widget_host_view_ = new RenderWidgetHostViewMac(render_view_host_);
-}
-
-RenderWidgetHostView* BalloonViewHost::render_widget_host_view() const {
- return render_widget_host_view_;
+ return tab_contents_->GetContentNativeView();
}
diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
index b49f72c..22734f8 100644
--- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
+++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
@@ -32,6 +32,7 @@
#include "chrome/common/extensions/extension.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/render_widget_host_view.h"
+#include "content/browser/tab_contents/tab_contents.h"
#include "content/public/browser/notification_source.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
@@ -344,9 +345,11 @@ void BalloonViewImpl::Show(Balloon* balloon) {
void BalloonViewImpl::Update() {
DCHECK(html_contents_.get()) << "BalloonView::Update called before Show";
- if (html_contents_->render_view_host())
- html_contents_->render_view_host()->NavigateToURL(
- balloon_->notification().content_url());
+ if (!html_contents_->tab_contents())
+ return;
+ html_contents_->tab_contents()->controller().LoadURL(
+ balloon_->notification().content_url(), GURL(),
+ content::PAGE_TRANSITION_LINK, std::string());
}
gfx::Point BalloonViewImpl::GetContentsOffset() const {
diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc
index 2f3da9d..ee44ae8 100644
--- a/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc
+++ b/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc
@@ -6,12 +6,11 @@
#include "chrome/browser/notifications/balloon.h"
#include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/renderer_host/render_widget_host_view.h"
#include "content/browser/renderer_host/render_widget_host_view_gtk.h"
+#include "content/browser/tab_contents/tab_contents.h"
BalloonViewHost::BalloonViewHost(Balloon* balloon)
- : BalloonHost(balloon),
- render_widget_host_view_(NULL) {
+ : BalloonHost(balloon) {
}
BalloonViewHost::~BalloonViewHost() {
@@ -19,21 +18,11 @@ BalloonViewHost::~BalloonViewHost() {
}
void BalloonViewHost::UpdateActualSize(const gfx::Size& new_size) {
- render_widget_host_view_->SetSize(new_size);
+ tab_contents_->render_view_host()->view()->SetSize(new_size);
gtk_widget_set_size_request(
native_view(), new_size.width(), new_size.height());
}
gfx::NativeView BalloonViewHost::native_view() const {
- return render_widget_host_view_->native_view();
-}
-
-void BalloonViewHost::InitRenderWidgetHostView() {
- DCHECK(render_view_host_);
- render_widget_host_view_ = new RenderWidgetHostViewGtk(render_view_host_);
- render_widget_host_view_->InitAsChild();
-}
-
-RenderWidgetHostView* BalloonViewHost::render_widget_host_view() const {
- return render_widget_host_view_;
+ return tab_contents_->GetNativeView();
}
diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h b/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h
index 656ebb3..ef63643 100644
--- a/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h
+++ b/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h
@@ -27,14 +27,7 @@ class BalloonViewHost : public BalloonHost {
// Accessors.
gfx::NativeView native_view() const;
- protected:
- virtual void InitRenderWidgetHostView();
- virtual RenderWidgetHostView* render_widget_host_view() const;
-
private:
- // The GTK-specific widget host view. Owned by its native view.
- RenderWidgetHostViewGtk* render_widget_host_view_;
-
DISALLOW_COPY_AND_ASSIGN(BalloonViewHost);
};
diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc
index 64ddc93..75b93fa 100644
--- a/chrome/browser/ui/views/notifications/balloon_view.cc
+++ b/chrome/browser/ui/views/notifications/balloon_view.cc
@@ -19,6 +19,7 @@
#include "chrome/common/chrome_notification_types.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/render_widget_host_view.h"
+#include "content/browser/tab_contents/tab_contents.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"
#include "content/public/browser/notification_types.h"
@@ -211,7 +212,8 @@ void BalloonViewImpl::RepositionToBalloon() {
gfx::Rect contents_rect = GetContentsRectangle();
html_container_->SetBounds(contents_rect);
html_contents_->SetPreferredSize(contents_rect.size());
- RenderWidgetHostView* view = html_contents_->render_view_host()->view();
+ RenderWidgetHostView* view =
+ html_contents_->tab_contents()->GetRenderWidgetHostView();
if (view)
view->SetSize(contents_rect.size());
return;
@@ -227,9 +229,11 @@ void BalloonViewImpl::RepositionToBalloon() {
void BalloonViewImpl::Update() {
DCHECK(html_contents_.get()) << "BalloonView::Update called before Show";
- if (html_contents_->render_view_host())
- html_contents_->render_view_host()->NavigateToURL(
- balloon_->notification().content_url());
+ if (!html_contents_->tab_contents())
+ return;
+ html_contents_->tab_contents()->controller().LoadURL(
+ balloon_->notification().content_url(), GURL(),
+ content::PAGE_TRANSITION_LINK, std::string());
}
void BalloonViewImpl::AnimationProgressed(const ui::Animation* animation) {
@@ -257,7 +261,8 @@ void BalloonViewImpl::AnimationProgressed(const ui::Animation* animation) {
html_container_->SetShape(path.CreateNativeRegion());
html_contents_->SetPreferredSize(contents_rect.size());
- RenderWidgetHostView* view = html_contents_->render_view_host()->view();
+ RenderWidgetHostView* view =
+ html_contents_->tab_contents()->GetRenderWidgetHostView();
if (view)
view->SetSize(contents_rect.size());
}
diff --git a/chrome/browser/ui/views/notifications/balloon_view_host.cc b/chrome/browser/ui/views/notifications/balloon_view_host.cc
index d018b6c..a59b374 100644
--- a/chrome/browser/ui/views/notifications/balloon_view_host.cc
+++ b/chrome/browser/ui/views/notifications/balloon_view_host.cc
@@ -7,13 +7,12 @@
#include "chrome/browser/notifications/balloon.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/render_widget_host_view.h"
+#include "content/browser/tab_contents/tab_contents.h"
#include "content/public/browser/content_browser_client.h"
#include "views/widget/widget.h"
#if defined(USE_AURA)
#include "content/browser/renderer_host/render_widget_host_view_aura.h"
-#elif defined(OS_WIN)
-#include "content/browser/renderer_host/render_widget_host_view_win.h"
#elif defined(TOUCH_UI)
#include "chrome/browser/renderer_host/render_widget_host_view_views.h"
#elif defined(TOOLKIT_USES_GTK)
@@ -56,45 +55,25 @@ BalloonViewHost::~BalloonViewHost() {
void BalloonViewHost::Init(gfx::NativeView parent_native_view) {
parent_native_view_ = parent_native_view;
BalloonHost::Init();
-}
-
-void BalloonViewHost::InitRenderWidgetHostView() {
- DCHECK(render_view_host_);
-
- render_widget_host_view_ =
- content::GetContentClient()->browser()->CreateViewForWidget(
- render_view_host_);
- // TODO(johnnyg): http://crbug.com/23954. Need a cross-platform solution.
+ RenderWidgetHostView* render_widget_host_view =
+ tab_contents_->render_view_host()->view();
#if defined(USE_AURA)
- RenderWidgetHostViewAura* view_aura =
- static_cast<RenderWidgetHostViewAura*>(render_widget_host_view_);
- view_aura->InitAsChild();
- view_aura->Show();
- native_host_->Attach(view_aura->GetNativeView());
+ // TODO(beng): (same as touch_ui probably).
+ NOTIMPLEMENTED();
#elif defined(OS_WIN)
- RenderWidgetHostViewWin* view_win =
- static_cast<RenderWidgetHostViewWin*>(render_widget_host_view_);
-
- // Create the HWND.
- HWND hwnd = view_win->Create(parent_native_view_);
- view_win->ShowWindow(SW_SHOW);
- native_host_->Attach(hwnd);
-#elif defined(TOUCH_UI)
+ native_host_->Attach(render_widget_host_view->GetNativeView());
+#elif defined(TOOLKIT_USES_GTK)
+#if defined(TOUCH_UI)
RenderWidgetHostViewViews* view_views =
- static_cast<RenderWidgetHostViewViews*>(render_widget_host_view_);
- view_views->InitAsChild();
+ static_cast<RenderWidgetHostViewViews*>(render_widget_host_view);
native_host_->AttachToView(view_views);
-#elif defined(TOOLKIT_USES_GTK)
+#else
RenderWidgetHostViewGtk* view_gtk =
- static_cast<RenderWidgetHostViewGtk*>(render_widget_host_view_);
- view_gtk->InitAsChild();
+ static_cast<RenderWidgetHostViewGtk*>(render_widget_host_view);
native_host_->Attach(view_gtk->native_view());
+#endif
#else
NOTIMPLEMENTED();
#endif
}
-
-RenderWidgetHostView* BalloonViewHost::render_widget_host_view() const {
- return render_widget_host_view_;
-}
diff --git a/chrome/browser/ui/views/notifications/balloon_view_host.h b/chrome/browser/ui/views/notifications/balloon_view_host.h
index e3b0a23..3ad8b07 100644
--- a/chrome/browser/ui/views/notifications/balloon_view_host.h
+++ b/chrome/browser/ui/views/notifications/balloon_view_host.h
@@ -35,14 +35,7 @@ class BalloonViewHost : public BalloonHost {
// Initialize the view, parented to |parent|, and show it.
void Init(gfx::NativeView parent);
- protected:
- virtual void InitRenderWidgetHostView();
- virtual RenderWidgetHostView* render_widget_host_view() const;
-
private:
- // The platform-specific widget host view. Pointer is owned by the RVH.
- RenderWidgetHostView* render_widget_host_view_;
-
// The views-specific host view. Pointer owned by the views hierarchy.
views::NativeViewHost* native_host_;
generated by cgit v1.1 at 2025-04-03 12:32:53 +0000