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