Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/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 1788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1799 gfx::Insets insets(GetFindBarBoundingBox().y() + 1, | 1799 gfx::Insets insets(GetFindBarBoundingBox().y() + 1, |
| 1800 0, | 1800 0, |
| 1801 0, | 1801 0, |
| 1802 0); | 1802 0); |
| 1803 aeropeek_manager_->SetContentInsets(insets); | 1803 aeropeek_manager_->SetContentInsets(insets); |
| 1804 } | 1804 } |
| 1805 #endif | 1805 #endif |
| 1806 } | 1806 } |
| 1807 | 1807 |
| 1808 void BrowserView::PaintChildren(gfx::Canvas* canvas) { | 1808 void BrowserView::PaintChildren(gfx::Canvas* canvas) { |
| 1809 views::ClientView::PaintChildren(canvas); | 1809 // Paint the |infobar_container_| last so that it may paint its |
| 1810 // overlapping tabs. | |
| 1811 for (int i = 0, count = child_count(); i < count; ++i) { | |
|
Peter Kasting
2011/03/04 22:23:42
Nit: Don't create a separate |count| temp. child_
Sheridan Rawlins
2011/03/05 18:06:54
FWIW, this was copied from views/view.cc
Done.
| |
| 1812 View* child = GetChildViewAt(i); | |
| 1813 if (!child) { | |
|
Peter Kasting
2011/03/04 22:23:42
Nit: Remove this conditional.
Sheridan Rawlins
2011/03/05 18:06:54
FWIW, this was copied from views/view.cc
Done.
| |
| 1814 NOTREACHED() << "Should not have a NULL child View for index in bounds"; | |
| 1815 continue; | |
| 1816 } | |
| 1817 if (child != infobar_container_) | |
| 1818 child->Paint(canvas); | |
| 1819 } | |
| 1810 | 1820 |
| 1811 infobar_container_->PaintInfoBarArrows(canvas->AsCanvasSkia(), | 1821 infobar_container_->Paint(canvas); |
| 1812 this, | |
| 1813 GetInfoBarArrowCenterX()); | |
| 1814 } | 1822 } |
| 1815 | 1823 |
| 1816 void BrowserView::ViewHierarchyChanged(bool is_add, | 1824 void BrowserView::ViewHierarchyChanged(bool is_add, |
| 1817 views::View* parent, | 1825 views::View* parent, |
| 1818 views::View* child) { | 1826 views::View* child) { |
| 1819 if (is_add && child == this && GetWidget() && !initialized_) { | 1827 if (is_add && child == this && GetWidget() && !initialized_) { |
| 1820 Init(); | 1828 Init(); |
| 1821 initialized_ = true; | 1829 initialized_ = true; |
| 1822 } | 1830 } |
| 1823 } | 1831 } |
| (...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2573 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2581 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 2574 | 2582 |
| 2575 return view; | 2583 return view; |
| 2576 } | 2584 } |
| 2577 #endif | 2585 #endif |
| 2578 | 2586 |
| 2579 // static | 2587 // static |
| 2580 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2588 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 2581 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2589 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 2582 } | 2590 } |
| OLD | NEW |