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

Unified Diff: trunk/src/chrome/browser/fullscreen_aurax11.cc

Issue 287783002: Revert 270232 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/fullscreen_aurax11.cc
===================================================================
--- trunk/src/chrome/browser/fullscreen_aurax11.cc (revision 270237)
+++ trunk/src/chrome/browser/fullscreen_aurax11.cc (working copy)
@@ -6,21 +6,11 @@
#include <vector>
-#include "ash/root_window_controller.h"
-#include "chrome/browser/ui/host_desktop.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
#include "ui/views/widget/widget.h"
bool IsFullScreenMode() {
-#if defined(USE_ASH)
- if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) {
- ash::RootWindowController* controller =
- ash::RootWindowController::ForTargetRootWindow();
- return controller && controller->GetWindowForFullscreenMode();
- }
-#endif
-
std::vector<aura::Window*> all_windows =
views::DesktopWindowTreeHostX11::GetAllOpenWindows();
// Only the topmost window is checked. This works fine in the most cases, but

Powered by Google App Engine
This is Rietveld 408576698