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

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

Issue 199283002: Remove ash::switches::UseImmersiveFullscreenForAllWindows() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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 | Annotate | Revision Log
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 2227 matching lines...) Expand 10 before | Expand all | Expand 10 after
2238 in_process_fullscreen_ = false; 2238 in_process_fullscreen_ = false;
2239 ToolbarSizeChanged(false); 2239 ToolbarSizeChanged(false);
2240 } 2240 }
2241 2241
2242 bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const { 2242 bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
2243 #if defined(OS_CHROMEOS) 2243 #if defined(OS_CHROMEOS)
2244 // Kiosk mode needs the whole screen. 2244 // Kiosk mode needs the whole screen.
2245 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) 2245 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
2246 return false; 2246 return false;
2247 bool is_browser_fullscreen = url.is_empty(); 2247 bool is_browser_fullscreen = url.is_empty();
2248 if (ash::switches::UseImmersiveFullscreenForAllWindows()) 2248 return is_browser_fullscreen;
2249 return is_browser_fullscreen;
2250 else
2251 return is_browser_fullscreen && IsBrowserTypeNormal();
2252 #else 2249 #else
2253 return false; 2250 return false;
2254 #endif 2251 #endif
2255 } 2252 }
2256 2253
2257 void BrowserView::LoadAccelerators() { 2254 void BrowserView::LoadAccelerators() {
2258 views::FocusManager* focus_manager = GetFocusManager(); 2255 views::FocusManager* focus_manager = GetFocusManager();
2259 DCHECK(focus_manager); 2256 DCHECK(focus_manager);
2260 2257
2261 // Let's fill our own accelerator table. 2258 // Let's fill our own accelerator table.
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
2577 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { 2574 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) {
2578 gfx::Point icon_bottom( 2575 gfx::Point icon_bottom(
2579 toolbar_->location_bar()->GetLocationBarAnchorPoint()); 2576 toolbar_->location_bar()->GetLocationBarAnchorPoint());
2580 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); 2577 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom);
2581 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); 2578 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
2582 ConvertPointToTarget(infobar_container_, this, &infobar_top); 2579 ConvertPointToTarget(infobar_container_, this, &infobar_top);
2583 top_arrow_height = infobar_top.y() - icon_bottom.y(); 2580 top_arrow_height = infobar_top.y() - icon_bottom.y();
2584 } 2581 }
2585 return top_arrow_height; 2582 return top_arrow_height;
2586 } 2583 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698