| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1905 void BrowserView::Layout() { | 1905 void BrowserView::Layout() { |
| 1906 if (!initialized_ || in_process_fullscreen_) | 1906 if (!initialized_ || in_process_fullscreen_) |
| 1907 return; | 1907 return; |
| 1908 | 1908 |
| 1909 views::View::Layout(); | 1909 views::View::Layout(); |
| 1910 | 1910 |
| 1911 // TODO(jamescook): Why was this in the middle of layout code? | 1911 // TODO(jamescook): Why was this in the middle of layout code? |
| 1912 toolbar_->location_bar()->omnibox_view()->SetFocusable(IsToolbarVisible()); | 1912 toolbar_->location_bar()->omnibox_view()->SetFocusable(IsToolbarVisible()); |
| 1913 } | 1913 } |
| 1914 | 1914 |
| 1915 void BrowserView::PaintChildren(const PaintContext& context) { | 1915 void BrowserView::PaintChildren(const ui::PaintContext& context) { |
| 1916 // Paint the |infobar_container_| last so that it may paint its | 1916 // Paint the |infobar_container_| last so that it may paint its |
| 1917 // overlapping tabs. | 1917 // overlapping tabs. |
| 1918 for (int i = 0; i < child_count(); ++i) { | 1918 for (int i = 0; i < child_count(); ++i) { |
| 1919 View* child = child_at(i); | 1919 View* child = child_at(i); |
| 1920 if (child != infobar_container_ && !child->layer()) | 1920 if (child != infobar_container_ && !child->layer()) |
| 1921 child->Paint(context); | 1921 child->Paint(context); |
| 1922 } | 1922 } |
| 1923 | 1923 |
| 1924 infobar_container_->Paint(context); | 1924 infobar_container_->Paint(context); |
| 1925 } | 1925 } |
| (...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2624 return immersive_mode_controller()->IsEnabled(); | 2624 return immersive_mode_controller()->IsEnabled(); |
| 2625 } | 2625 } |
| 2626 | 2626 |
| 2627 views::Widget* BrowserView::GetBubbleAssociatedWidget() { | 2627 views::Widget* BrowserView::GetBubbleAssociatedWidget() { |
| 2628 return GetWidget(); | 2628 return GetWidget(); |
| 2629 } | 2629 } |
| 2630 | 2630 |
| 2631 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { | 2631 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { |
| 2632 return top_container_->GetBoundsInScreen(); | 2632 return top_container_->GetBoundsInScreen(); |
| 2633 } | 2633 } |
| OLD | NEW |