| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "ui/views/widget/desktop_aura/desktop_screen_x11.h" | 5 #include "ui/views/widget/desktop_aura/desktop_screen_x11.h" |
| 6 | 6 |
| 7 #include <X11/extensions/Xrandr.h> | 7 #include <X11/extensions/Xrandr.h> |
| 8 #include <X11/Xlib.h> | 8 #include <X11/Xlib.h> |
| 9 | 9 |
| 10 // It clashes with out RootWindow. | 10 // It clashes with out RootWindow. |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 configure_timer_->Start( | 239 configure_timer_->Start( |
| 240 FROM_HERE, | 240 FROM_HERE, |
| 241 base::TimeDelta::FromMilliseconds(kConfigureDelayMs), | 241 base::TimeDelta::FromMilliseconds(kConfigureDelayMs), |
| 242 this, | 242 this, |
| 243 &DesktopScreenX11::ConfigureTimerFired); | 243 &DesktopScreenX11::ConfigureTimerFired); |
| 244 } | 244 } |
| 245 } else { | 245 } else { |
| 246 NOTREACHED(); | 246 NOTREACHED(); |
| 247 } | 247 } |
| 248 | 248 |
| 249 return ui::POST_DISPATCH_NONE; | 249 return ui::kPostDispatchNone; |
| 250 } | 250 } |
| 251 | 251 |
| 252 //////////////////////////////////////////////////////////////////////////////// | 252 //////////////////////////////////////////////////////////////////////////////// |
| 253 // DesktopScreenX11, private: | 253 // DesktopScreenX11, private: |
| 254 | 254 |
| 255 DesktopScreenX11::DesktopScreenX11( | 255 DesktopScreenX11::DesktopScreenX11( |
| 256 const std::vector<gfx::Display>& test_displays) | 256 const std::vector<gfx::Display>& test_displays) |
| 257 : xdisplay_(gfx::GetXDisplay()), | 257 : xdisplay_(gfx::GetXDisplay()), |
| 258 x_root_window_(DefaultRootWindow(xdisplay_)), | 258 x_root_window_(DefaultRootWindow(xdisplay_)), |
| 259 has_xrandr_(false), | 259 has_xrandr_(false), |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 362 change_notifier_.NotifyDisplaysChanged(old_displays, displays_); | 362 change_notifier_.NotifyDisplaysChanged(old_displays, displays_); |
| 363 } | 363 } |
| 364 | 364 |
| 365 //////////////////////////////////////////////////////////////////////////////// | 365 //////////////////////////////////////////////////////////////////////////////// |
| 366 | 366 |
| 367 gfx::Screen* CreateDesktopScreen() { | 367 gfx::Screen* CreateDesktopScreen() { |
| 368 return new DesktopScreenX11; | 368 return new DesktopScreenX11; |
| 369 } | 369 } |
| 370 | 370 |
| 371 } // namespace views | 371 } // namespace views |
| OLD | NEW |