Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 1455193003: Draw popup window toolbars as only containing a location bar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@arbitrary_heights
Patch Set: Glass cleanups Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/glass_browser_frame_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2033 matching lines...) Expand 10 before | Expand all | Expand 10 after
2044 /////////////////////////////////////////////////////////////////////////////// 2044 ///////////////////////////////////////////////////////////////////////////////
2045 // BrowserView, OmniboxPopupModelObserver overrides: 2045 // BrowserView, OmniboxPopupModelObserver overrides:
2046 void BrowserView::OnOmniboxPopupShownOrHidden() { 2046 void BrowserView::OnOmniboxPopupShownOrHidden() {
2047 SetMaxTopArrowHeight(GetMaxTopInfoBarArrowHeight(), infobar_container_); 2047 SetMaxTopArrowHeight(GetMaxTopInfoBarArrowHeight(), infobar_container_);
2048 } 2048 }
2049 2049
2050 /////////////////////////////////////////////////////////////////////////////// 2050 ///////////////////////////////////////////////////////////////////////////////
2051 // BrowserView, InfoBarContainerDelegate overrides: 2051 // BrowserView, InfoBarContainerDelegate overrides:
2052 2052
2053 SkColor BrowserView::GetInfoBarSeparatorColor() const { 2053 SkColor BrowserView::GetInfoBarSeparatorColor() const {
2054 // NOTE: Keep this in sync with ToolbarView::OnPaint()! 2054 return GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR_SEPARATOR);
2055 return (IsTabStripVisible() || !frame_->ShouldUseNativeFrame()) ?
2056 ThemeProperties::GetDefaultColor(
2057 ThemeProperties::COLOR_TOOLBAR_SEPARATOR) :
2058 SK_ColorBLACK;
2059 } 2055 }
2060 2056
2061 void BrowserView::InfoBarContainerStateChanged(bool is_animating) { 2057 void BrowserView::InfoBarContainerStateChanged(bool is_animating) {
2062 ToolbarSizeChanged(is_animating); 2058 ToolbarSizeChanged(is_animating);
2063 } 2059 }
2064 2060
2065 bool BrowserView::DrawInfoBarArrows(int* x) const { 2061 bool BrowserView::DrawInfoBarArrows(int* x) const {
2066 if (x) { 2062 if (x) {
2067 gfx::Point anchor(toolbar_->location_bar()->GetLocationBarAnchorPoint()); 2063 gfx::Point anchor(toolbar_->location_bar()->GetLocationBarAnchorPoint());
2068 ConvertPointToTarget(toolbar_->location_bar(), this, &anchor); 2064 ConvertPointToTarget(toolbar_->location_bar(), this, &anchor);
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
2671 return immersive_mode_controller()->IsEnabled(); 2667 return immersive_mode_controller()->IsEnabled();
2672 } 2668 }
2673 2669
2674 views::Widget* BrowserView::GetBubbleAssociatedWidget() { 2670 views::Widget* BrowserView::GetBubbleAssociatedWidget() {
2675 return GetWidget(); 2671 return GetWidget();
2676 } 2672 }
2677 2673
2678 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() { 2674 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() {
2679 return top_container_->GetBoundsInScreen(); 2675 return top_container_->GetBoundsInScreen();
2680 } 2676 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/glass_browser_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698