| 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 1855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1866 ProcessFullscreen(false, FOR_DESKTOP, GURL(), FEB_TYPE_NONE); | 1866 ProcessFullscreen(false, FOR_DESKTOP, GURL(), FEB_TYPE_NONE); |
| 1867 } | 1867 } |
| 1868 } | 1868 } |
| 1869 | 1869 |
| 1870 void BrowserView::SetImmersiveStyle(bool immersive) { | 1870 void BrowserView::SetImmersiveStyle(bool immersive) { |
| 1871 // Only the tab strip changes its painting style for immersive fullscreen. | 1871 // Only the tab strip changes its painting style for immersive fullscreen. |
| 1872 if (tabstrip_) | 1872 if (tabstrip_) |
| 1873 tabstrip_->SetImmersiveStyle(immersive); | 1873 tabstrip_->SetImmersiveStyle(immersive); |
| 1874 } | 1874 } |
| 1875 | 1875 |
| 1876 WebContents* BrowserView::GetWebContents() { | |
| 1877 return GetActiveWebContents(); | |
| 1878 } | |
| 1879 | |
| 1880 /////////////////////////////////////////////////////////////////////////////// | 1876 /////////////////////////////////////////////////////////////////////////////// |
| 1881 // BrowserView, InfoBarContainer::Delegate overrides: | 1877 // BrowserView, InfoBarContainer::Delegate overrides: |
| 1882 | 1878 |
| 1883 SkColor BrowserView::GetInfoBarSeparatorColor() const { | 1879 SkColor BrowserView::GetInfoBarSeparatorColor() const { |
| 1884 // NOTE: Keep this in sync with ToolbarView::OnPaint()! | 1880 // NOTE: Keep this in sync with ToolbarView::OnPaint()! |
| 1885 return (IsTabStripVisible() || !frame_->ShouldUseNativeFrame()) ? | 1881 return (IsTabStripVisible() || !frame_->ShouldUseNativeFrame()) ? |
| 1886 ThemeProperties::GetDefaultColor( | 1882 ThemeProperties::GetDefaultColor( |
| 1887 ThemeProperties::COLOR_TOOLBAR_SEPARATOR) : | 1883 ThemeProperties::COLOR_TOOLBAR_SEPARATOR) : |
| 1888 SK_ColorBLACK; | 1884 SK_ColorBLACK; |
| 1889 } | 1885 } |
| (...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2672 // The +1 in the next line creates a 1-px gap between icon and arrow tip. | 2668 // The +1 in the next line creates a 1-px gap between icon and arrow tip. |
| 2673 gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() - | 2669 gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() - |
| 2674 LocationBarView::kIconInternalPadding + 1); | 2670 LocationBarView::kIconInternalPadding + 1); |
| 2675 ConvertPointToTarget(location_icon_view, this, &icon_bottom); | 2671 ConvertPointToTarget(location_icon_view, this, &icon_bottom); |
| 2676 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); | 2672 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); |
| 2677 ConvertPointToTarget(infobar_container_, this, &infobar_top); | 2673 ConvertPointToTarget(infobar_container_, this, &infobar_top); |
| 2678 top_arrow_height = infobar_top.y() - icon_bottom.y(); | 2674 top_arrow_height = infobar_top.y() - icon_bottom.y(); |
| 2679 } | 2675 } |
| 2680 return top_arrow_height; | 2676 return top_arrow_height; |
| 2681 } | 2677 } |
| OLD | NEW |