| 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/display/screen.h" | 5 #include "ui/display/screen.h" |
| 6 | 6 |
| 7 #import <ApplicationServices/ApplicationServices.h> | 7 #import <ApplicationServices/ApplicationServices.h> |
| 8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 // The timer to delay configuring outputs and notifying observers. | 322 // The timer to delay configuring outputs and notifying observers. |
| 323 base::Timer configure_timer_; | 323 base::Timer configure_timer_; |
| 324 | 324 |
| 325 DisplayChangeNotifier change_notifier_; | 325 DisplayChangeNotifier change_notifier_; |
| 326 | 326 |
| 327 DISALLOW_COPY_AND_ASSIGN(ScreenMac); | 327 DISALLOW_COPY_AND_ASSIGN(ScreenMac); |
| 328 }; | 328 }; |
| 329 | 329 |
| 330 } // namespace | 330 } // namespace |
| 331 | 331 |
| 332 // static |
| 333 static gfx::NativeWindow Display::WindowForView(gfx::NativeView view) { |
| 334 return [view window]; |
| 335 } |
| 336 |
| 332 #if !defined(USE_AURA) | 337 #if !defined(USE_AURA) |
| 333 Screen* CreateNativeScreen() { | 338 Screen* CreateNativeScreen() { |
| 334 return new ScreenMac; | 339 return new ScreenMac; |
| 335 } | 340 } |
| 336 #endif | 341 #endif |
| 337 | 342 |
| 338 } // namespace display | 343 } // namespace display |
| OLD | NEW |