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

Side by Side Diff: chrome/browser/fullscreen_win.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 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:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/fullscreen.h" 5 #include "chrome/browser/fullscreen.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 DWORD modes = 0; 97 DWORD modes = 0;
98 ::GetConsoleDisplayMode(&modes); 98 ::GetConsoleDisplayMode(&modes);
99 ::FreeConsole(); 99 ::FreeConsole();
100 100
101 return (modes & (CONSOLE_FULLSCREEN | CONSOLE_FULLSCREEN_HARDWARE)) != 0; 101 return (modes & (CONSOLE_FULLSCREEN | CONSOLE_FULLSCREEN_HARDWARE)) != 0;
102 } 102 }
103 103
104 bool IsFullScreenMode() { 104 bool IsFullScreenMode() {
105 #if defined(USE_ASH) 105 #if defined(USE_ASH)
106 if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) { 106 if (chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_ASH) {
107 ash::RootWindowController* controller = 107 ash::RootWindowController* controller =
108 ash::RootWindowController::ForTargetRootWindow(); 108 ash::RootWindowController::ForTargetRootWindow();
109 return controller && controller->GetWindowForFullscreenMode(); 109 return controller && controller->GetWindowForFullscreenMode();
110 } 110 }
111 #endif 111 #endif
112 return IsPlatformFullScreenMode() || 112 return IsPlatformFullScreenMode() ||
113 IsFullScreenWindowMode() || 113 IsFullScreenWindowMode() ||
114 IsFullScreenConsoleMode(); 114 IsFullScreenConsoleMode();
115 } 115 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698