OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/views/frame/browser_view.h" | 5 #include "chrome/browser/views/frame/browser_view.h" |
6 | 6 |
7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1390 int bottom = LayoutExtensionShelf(); | 1390 int bottom = LayoutExtensionShelf(); |
1391 bottom = LayoutDownloadShelf(bottom); | 1391 bottom = LayoutDownloadShelf(bottom); |
1392 LayoutTabContents(top, bottom); | 1392 LayoutTabContents(top, bottom); |
1393 // This must be done _after_ we lay out the TabContents since this code calls | 1393 // This must be done _after_ we lay out the TabContents since this code calls |
1394 // back into us to find the bounding box the find bar must be laid out within, | 1394 // back into us to find the bounding box the find bar must be laid out within, |
1395 // and that code depends on the TabContentsContainer's bounds being up to | 1395 // and that code depends on the TabContentsContainer's bounds being up to |
1396 // date. | 1396 // date. |
1397 FindBarController* find_controller = browser_->find_bar(); | 1397 FindBarController* find_controller = browser_->find_bar(); |
1398 if (find_controller) | 1398 if (find_controller) |
1399 find_controller->find_bar()->MoveWindowIfNecessary(gfx::Rect(), true); | 1399 find_controller->find_bar()->MoveWindowIfNecessary(gfx::Rect(), true); |
1400 LayoutStatusBubble(bottom); | 1400 // Align status bubble with the bottom of the contents_container_. |
| 1401 LayoutStatusBubble(top + contents_container_->bounds().height()); |
1401 SchedulePaint(); | 1402 SchedulePaint(); |
1402 } | 1403 } |
1403 | 1404 |
1404 void BrowserView::ViewHierarchyChanged(bool is_add, | 1405 void BrowserView::ViewHierarchyChanged(bool is_add, |
1405 views::View* parent, | 1406 views::View* parent, |
1406 views::View* child) { | 1407 views::View* child) { |
1407 if (is_add && child == this && GetWidget() && !initialized_) { | 1408 if (is_add && child == this && GetWidget() && !initialized_) { |
1408 Init(); | 1409 Init(); |
1409 initialized_ = true; | 1410 initialized_ = true; |
1410 } | 1411 } |
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1891 | 1892 |
1892 // static | 1893 // static |
1893 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 1894 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
1894 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 1895 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
1895 } | 1896 } |
1896 | 1897 |
1897 // static | 1898 // static |
1898 void BrowserList::AllBrowsersClosed() { | 1899 void BrowserList::AllBrowsersClosed() { |
1899 views::Window::CloseAllSecondaryWindows(); | 1900 views::Window::CloseAllSecondaryWindows(); |
1900 } | 1901 } |
OLD | NEW |