| 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(TOOLKIT_USES_GTK) | 7 #if defined(TOOLKIT_USES_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 1801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1812 0); | 1812 0); |
| 1813 aeropeek_manager_->SetContentInsets(insets); | 1813 aeropeek_manager_->SetContentInsets(insets); |
| 1814 } | 1814 } |
| 1815 #endif | 1815 #endif |
| 1816 } | 1816 } |
| 1817 | 1817 |
| 1818 void BrowserView::PaintChildren(gfx::Canvas* canvas) { | 1818 void BrowserView::PaintChildren(gfx::Canvas* canvas) { |
| 1819 // Paint the |infobar_container_| last so that it may paint its | 1819 // Paint the |infobar_container_| last so that it may paint its |
| 1820 // overlapping tabs. | 1820 // overlapping tabs. |
| 1821 for (int i = 0; i < child_count(); ++i) { | 1821 for (int i = 0; i < child_count(); ++i) { |
| 1822 View* child = GetChildViewAt(i); | 1822 View* child = child_at(i); |
| 1823 if (child != infobar_container_) | 1823 if (child != infobar_container_) |
| 1824 child->Paint(canvas); | 1824 child->Paint(canvas); |
| 1825 } | 1825 } |
| 1826 | 1826 |
| 1827 infobar_container_->Paint(canvas); | 1827 infobar_container_->Paint(canvas); |
| 1828 } | 1828 } |
| 1829 | 1829 |
| 1830 void BrowserView::ViewHierarchyChanged(bool is_add, | 1830 void BrowserView::ViewHierarchyChanged(bool is_add, |
| 1831 views::View* parent, | 1831 views::View* parent, |
| 1832 views::View* child) { | 1832 views::View* child) { |
| (...skipping 28 matching lines...) Expand all Loading... |
| 1861 toolbar_->location_bar()->location_icon_view(); | 1861 toolbar_->location_bar()->location_icon_view(); |
| 1862 gfx::Point icon_center(location_icon_view->GetImageBounds().CenterPoint()); | 1862 gfx::Point icon_center(location_icon_view->GetImageBounds().CenterPoint()); |
| 1863 ConvertPointToView(location_icon_view, this, &icon_center); | 1863 ConvertPointToView(location_icon_view, this, &icon_center); |
| 1864 *x = icon_center.x(); | 1864 *x = icon_center.x(); |
| 1865 } | 1865 } |
| 1866 return true; | 1866 return true; |
| 1867 } | 1867 } |
| 1868 | 1868 |
| 1869 bool BrowserView::SplitHandleMoved(views::SingleSplitView* view) { | 1869 bool BrowserView::SplitHandleMoved(views::SingleSplitView* view) { |
| 1870 for (int i = 0; i < view->child_count(); ++i) | 1870 for (int i = 0; i < view->child_count(); ++i) |
| 1871 view->GetChildViewAt(i)->InvalidateLayout(); | 1871 view->child_at(i)->InvalidateLayout(); |
| 1872 SchedulePaint(); | 1872 SchedulePaint(); |
| 1873 Layout(); | 1873 Layout(); |
| 1874 return false; | 1874 return false; |
| 1875 } | 1875 } |
| 1876 | 1876 |
| 1877 views::LayoutManager* BrowserView::CreateLayoutManager() const { | 1877 views::LayoutManager* BrowserView::CreateLayoutManager() const { |
| 1878 return new BrowserViewLayout; | 1878 return new BrowserViewLayout; |
| 1879 } | 1879 } |
| 1880 | 1880 |
| 1881 void BrowserView::InitTabStrip(TabStripModel* model) { | 1881 void BrowserView::InitTabStrip(TabStripModel* model) { |
| (...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2637 view->GetWidget()->non_client_view()->SetAccessibleName( | 2637 view->GetWidget()->non_client_view()->SetAccessibleName( |
| 2638 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 2638 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 2639 return view; | 2639 return view; |
| 2640 } | 2640 } |
| 2641 #endif | 2641 #endif |
| 2642 | 2642 |
| 2643 // static | 2643 // static |
| 2644 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { | 2644 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { |
| 2645 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); | 2645 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); |
| 2646 } | 2646 } |
| OLD | NEW |