summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authoranicolao@google.com <anicolao@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-22 20:19:40 +0000
committeranicolao@google.com <anicolao@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-22 20:19:40 +0000
commited8838e4d87055ae3faf24cee8458abb61f46b1e (patch)
tree416e5ebdc6f91a32d7e8e417bb1ce52e692f8ec2 /chrome/browser
parentcf3ac397d5d729e299da8638c672055bba666e92 (diff)
downloadchromium_src-ed8838e4d87055ae3faf24cee8458abb61f46b1e.zip
chromium_src-ed8838e4d87055ae3faf24cee8458abb61f46b1e.tar.gz
chromium_src-ed8838e4d87055ae3faf24cee8458abb61f46b1e.tar.bz2
Fix TaskManagerBrowserTest.NoticeNotificationChanges for touchui==1.
BUG=none TEST=./out/Debug/browser_tests --gtest_filter='NoticeNotificationChanges' Review URL: http://codereview.chromium.org/6000007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69971 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/ui/views/notifications/balloon_view_host.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/notifications/balloon_view_host.cc b/chrome/browser/ui/views/notifications/balloon_view_host.cc
index ddc59c8..eb9cb20 100644
--- a/chrome/browser/ui/views/notifications/balloon_view_host.cc
+++ b/chrome/browser/ui/views/notifications/balloon_view_host.cc
@@ -37,8 +37,8 @@ class BalloonViewHostView : public views::NativeViewHost {
views::View* child) {
NativeViewHost::ViewHierarchyChanged(is_add, parent, child);
if (is_add && GetWidget() && !initialized_) {
- host_->Init(GetWidget()->GetNativeView());
initialized_ = true;
+ host_->Init(GetWidget()->GetNativeView());
}
}
@@ -79,7 +79,7 @@ void BalloonViewHost::InitRenderWidgetHostView() {
RenderWidgetHostViewViews* view_views =
static_cast<RenderWidgetHostViewViews*>(render_widget_host_view_);
view_views->InitAsChild();
- native_host_->Attach(view_views->native_view());
+ native_host_->AttachToView(view_views);
#else
RenderWidgetHostViewGtk* view_gtk =
static_cast<RenderWidgetHostViewGtk*>(render_widget_host_view_);