chrome/browser/ui/views/apps/chrome_native_app_window_views.cc - Issue 549453005: Run athena on device

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

Issue 549453005: Run athena on device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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:

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

index 44b62d1a0cde178f4ecd2afd521d43dd09f044a9..dd4ebe9777fced600a6071b9bd4139729caeff5b 100644

--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

@@ -583,7 +583,8 @@ void ChromeNativeAppWindowViews::SetFullscreen(int fullscreen_types) {

is_fullscreen_ = (fullscreen_types != AppWindow::FULLSCREEN_TYPE_NONE);

widget()->SetFullscreen(is_fullscreen_);

-#if defined(USE_ASH)

+ // TODO(oshima): Remove USE_ATHENA once athena has its own NativeAppWindow.

+#if defined(USE_ASH) && !defined(USE_ATHENA)

if (immersive_fullscreen_controller_.get()) {

// |immersive_fullscreen_controller_| should only be set if immersive

// fullscreen is the fullscreen type used by the OS.