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 940 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
951 fullscreen_bubble_->UpdateContent(url, bubble_type); | 951 fullscreen_bubble_->UpdateContent(url, bubble_type); |
952 } else { | 952 } else { |
953 fullscreen_bubble_.reset(new FullscreenExitBubbleViews( | 953 fullscreen_bubble_.reset(new FullscreenExitBubbleViews( |
954 this, url, bubble_type)); | 954 this, url, bubble_type)); |
955 } | 955 } |
956 } | 956 } |
957 | 957 |
958 bool BrowserView::ShouldHideUIForFullscreen() const { | 958 bool BrowserView::ShouldHideUIForFullscreen() const { |
959 #if defined(USE_ASH) | 959 #if defined(USE_ASH) |
960 // Immersive mode needs UI for the slide-down top panel. | 960 // Immersive mode needs UI for the slide-down top panel. |
961 return IsFullscreen() && !immersive_mode_controller_->IsEnabled(); | 961 if (immersive_mode_controller_->IsEnabled()) |
| 962 return false; |
962 #endif | 963 #endif |
963 return IsFullscreen(); | 964 return IsFullscreen(); |
964 } | 965 } |
965 | 966 |
966 bool BrowserView::IsFullscreen() const { | 967 bool BrowserView::IsFullscreen() const { |
967 return frame_->IsFullscreen(); | 968 return frame_->IsFullscreen(); |
968 } | 969 } |
969 | 970 |
970 bool BrowserView::IsFullscreenBubbleVisible() const { | 971 bool BrowserView::IsFullscreenBubbleVisible() const { |
971 return fullscreen_bubble_ != NULL; | 972 return fullscreen_bubble_ != NULL; |
(...skipping 1602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2574 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { | 2575 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { |
2575 gfx::Point icon_bottom( | 2576 gfx::Point icon_bottom( |
2576 toolbar_->location_bar()->GetLocationBarAnchorPoint()); | 2577 toolbar_->location_bar()->GetLocationBarAnchorPoint()); |
2577 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); | 2578 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); |
2578 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); | 2579 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); |
2579 ConvertPointToTarget(infobar_container_, this, &infobar_top); | 2580 ConvertPointToTarget(infobar_container_, this, &infobar_top); |
2580 top_arrow_height = infobar_top.y() - icon_bottom.y(); | 2581 top_arrow_height = infobar_top.y() - icon_bottom.y(); |
2581 } | 2582 } |
2582 return top_arrow_height; | 2583 return top_arrow_height; |
2583 } | 2584 } |
OLD | NEW |