summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/frame
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 17:31:00 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 17:31:00 +0000
commit909a42ef4998bcda783dabe019dbcdedd4b49a18 (patch)
treec2cb6a73c007b3e776e6b8221a3bf44d05adde1b /chrome/browser/views/frame
parent82918ccd87a794552905fc3a9b04c8afae1bc4ca (diff)
downloadchromium_src-909a42ef4998bcda783dabe019dbcdedd4b49a18.zip
chromium_src-909a42ef4998bcda783dabe019dbcdedd4b49a18.tar.gz
chromium_src-909a42ef4998bcda783dabe019dbcdedd4b49a18.tar.bz2
Commit http://codereview.chromium.org/3112033/show, fixing status bubble in RTL.
Review URL: http://codereview.chromium.org/3135046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
-rw-r--r--chrome/browser/views/frame/browser_view.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index d982c11..444baa0 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -502,7 +502,7 @@ BrowserView::BrowserView(Browser* browser)
initialized_(false),
ignore_layout_(true)
#if defined(OS_WIN)
- ,hung_window_detector_(&hung_plugin_action_),
+ , hung_window_detector_(&hung_plugin_action_),
ticker_(0)
#endif
{
@@ -1948,7 +1948,7 @@ void BrowserView::Init() {
AddChildView(contents_split_);
set_contents_view(contents_split_);
- status_bubble_.reset(new StatusBubbleViews(GetWidget()));
+ status_bubble_.reset(new StatusBubbleViews(contents_));
#if defined(OS_WIN)
InitSystemMenu();
@@ -2007,8 +2007,8 @@ void BrowserView::LayoutStatusBubble(int top) {
if (UseVerticalTabs() && IsTabStripVisible())
x += tabstrip_->bounds().right();
int height = status_bubble_->GetPreferredSize().height();
- gfx::Point origin(x, top - height + overlap);
- ConvertPointToView(this, GetParent(), &origin);
+ gfx::Point origin(
+ -overlap, contents_container_->bounds().height() - height + overlap);
status_bubble_->SetBounds(origin.x(), origin.y(), width() / 3, height);
}
@@ -2479,7 +2479,6 @@ void BrowserView::HideMatchPreview() {
void BrowserView::ProcessTabSelected(TabContents* new_contents,
bool change_tab_contents) {
-
// Update various elements that are interested in knowing the current
// TabContents.