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

Side by Side Diff: trunk/src/chrome/browser/fullscreen_aurax11.cc

Issue 276773004: Revert 269892 "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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <vector> 7 #include <vector>
8 8
9 #include "ash/root_window_controller.h"
10 #include "chrome/browser/ui/host_desktop.h"
11 #include "ui/gfx/native_widget_types.h" 9 #include "ui/gfx/native_widget_types.h"
12 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" 10 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
13 #include "ui/views/widget/widget.h" 11 #include "ui/views/widget/widget.h"
14 12
15 bool IsFullScreenMode() { 13 bool IsFullScreenMode() {
16 #if defined(USE_ASH)
17 if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) {
18 ash::RootWindowController* controller =
19 ash::RootWindowController::ForTargetRootWindow();
20 return controller && controller->GetWindowForFullscreenMode();
21 }
22 #endif
23
24 std::vector<aura::Window*> all_windows = 14 std::vector<aura::Window*> all_windows =
25 views::DesktopWindowTreeHostX11::GetAllOpenWindows(); 15 views::DesktopWindowTreeHostX11::GetAllOpenWindows();
26 // Only the topmost window is checked. This works fine in the most cases, but 16 // Only the topmost window is checked. This works fine in the most cases, but
27 // it may return false when there are multiple displays and one display has 17 // it may return false when there are multiple displays and one display has
28 // a fullscreen window but others don't. See: crbug.com/345484 18 // a fullscreen window but others don't. See: crbug.com/345484
29 if (all_windows.empty()) 19 if (all_windows.empty())
30 return false; 20 return false;
31 21
32 views::Widget* widget = 22 views::Widget* widget =
33 views::Widget::GetWidgetForNativeWindow(all_windows[0]); 23 views::Widget::GetWidgetForNativeWindow(all_windows[0]);
34 return widget && widget->IsFullscreen(); 24 return widget && widget->IsFullscreen();
35 } 25 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698