| 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 #ifndef ASH_DISPLAY_DISPLAY_MANAGER_H_ | 5 #ifndef ASH_DISPLAY_DISPLAY_MANAGER_H_ |
| 6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_ | 6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 aura::Window* drag_source) const; | 335 aura::Window* drag_source) const; |
| 336 | 336 |
| 337 // Create a screen instance to be used during shutdown. | 337 // Create a screen instance to be used during shutdown. |
| 338 void CreateScreenForShutdown() const; | 338 void CreateScreenForShutdown() const; |
| 339 | 339 |
| 340 // A unit test may change the internal display id (which never happens on | 340 // A unit test may change the internal display id (which never happens on |
| 341 // a real device). This will update the mode list for internal display | 341 // a real device). This will update the mode list for internal display |
| 342 // for this test scenario. | 342 // for this test scenario. |
| 343 void UpdateInternalManagedDisplayModeListForTest(); | 343 void UpdateInternalManagedDisplayModeListForTest(); |
| 344 | 344 |
| 345 // Zoom the internal display. |
| 346 bool ZoomInternalDisplay(bool up); |
| 347 |
| 348 // Reset the internal display zoom. |
| 349 void ResetInternalDisplayZoom(); |
| 350 |
| 345 private: | 351 private: |
| 346 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, ConvertPoint); | 352 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, ConvertPoint); |
| 347 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, TestNativeDisplaysChanged); | 353 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, TestNativeDisplaysChanged); |
| 348 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, | 354 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, |
| 349 NativeDisplaysChangedAfterPrimaryChange); | 355 NativeDisplaysChangedAfterPrimaryChange); |
| 350 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, AutomaticOverscanInsets); | 356 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, AutomaticOverscanInsets); |
| 351 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, Rotate); | 357 FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, Rotate); |
| 352 friend class AcceleratorControllerTest; | 358 friend class AcceleratorControllerTest; |
| 353 friend class DisplayManagerTest; | 359 friend class DisplayManagerTest; |
| 354 friend class chromeos::DisplayNotificationsTest; | 360 friend class chromeos::DisplayNotificationsTest; |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 bool unified_desktop_enabled_; | 478 bool unified_desktop_enabled_; |
| 473 | 479 |
| 474 base::WeakPtrFactory<DisplayManager> weak_ptr_factory_; | 480 base::WeakPtrFactory<DisplayManager> weak_ptr_factory_; |
| 475 | 481 |
| 476 DISALLOW_COPY_AND_ASSIGN(DisplayManager); | 482 DISALLOW_COPY_AND_ASSIGN(DisplayManager); |
| 477 }; | 483 }; |
| 478 | 484 |
| 479 } // namespace ash | 485 } // namespace ash |
| 480 | 486 |
| 481 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ | 487 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ |
| OLD | NEW |