| 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_CONTROLLER_H_ | 5 #ifndef ASH_DISPLAY_DISPLAY_CONTROLLER_H_ |
| 6 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_ | 6 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 void OnDisplayRemoved(const gfx::Display& display) override; | 152 void OnDisplayRemoved(const gfx::Display& display) override; |
| 153 void OnDisplayMetricsChanged(const gfx::Display& display, | 153 void OnDisplayMetricsChanged(const gfx::Display& display, |
| 154 uint32_t metrics) override; | 154 uint32_t metrics) override; |
| 155 | 155 |
| 156 // aura::WindowTreeHostObserver overrides: | 156 // aura::WindowTreeHostObserver overrides: |
| 157 void OnHostResized(const aura::WindowTreeHost* host) override; | 157 void OnHostResized(const aura::WindowTreeHost* host) override; |
| 158 | 158 |
| 159 // aura::DisplayManager::Delegate overrides: | 159 // aura::DisplayManager::Delegate overrides: |
| 160 void CreateOrUpdateMirroringDisplay( | 160 void CreateOrUpdateMirroringDisplay( |
| 161 const DisplayInfoList& info_list) override; | 161 const DisplayInfoList& info_list) override; |
| 162 void CloseMirroringDisplay() override; | 162 void CloseMirroringDisplayIfNotNecessary() override; |
| 163 void PreDisplayConfigurationChange(bool clear_focus) override; | 163 void PreDisplayConfigurationChange(bool clear_focus) override; |
| 164 void PostDisplayConfigurationChange() override; | 164 void PostDisplayConfigurationChange() override; |
| 165 | 165 |
| 166 private: | 166 private: |
| 167 FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, BoundsUpdated); | 167 FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, BoundsUpdated); |
| 168 FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, SecondaryDisplayLayout); | 168 FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, SecondaryDisplayLayout); |
| 169 friend class DisplayManager; | 169 friend class DisplayManager; |
| 170 friend class MirrorWindowController; | 170 friend class MirrorWindowController; |
| 171 | 171 |
| 172 // Creates a WindowTreeHost for |display| and stores it in the | 172 // Creates a WindowTreeHost for |display| and stores it in the |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 int64 cursor_display_id_for_restore_; | 230 int64 cursor_display_id_for_restore_; |
| 231 | 231 |
| 232 base::WeakPtrFactory<DisplayController> weak_ptr_factory_; | 232 base::WeakPtrFactory<DisplayController> weak_ptr_factory_; |
| 233 | 233 |
| 234 DISALLOW_COPY_AND_ASSIGN(DisplayController); | 234 DISALLOW_COPY_AND_ASSIGN(DisplayController); |
| 235 }; | 235 }; |
| 236 | 236 |
| 237 } // namespace ash | 237 } // namespace ash |
| 238 | 238 |
| 239 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ | 239 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ |
| OLD | NEW |