| 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 <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 | 151 |
| 152 // display::DisplayObserver overrides: | 152 // display::DisplayObserver overrides: |
| 153 void OnDisplayAdded(const display::Display& display) override; | 153 void OnDisplayAdded(const display::Display& display) override; |
| 154 void OnDisplayRemoved(const display::Display& display) override; | 154 void OnDisplayRemoved(const display::Display& display) override; |
| 155 void OnDisplayMetricsChanged(const display::Display& display, | 155 void OnDisplayMetricsChanged(const display::Display& display, |
| 156 uint32_t metrics) override; | 156 uint32_t metrics) override; |
| 157 | 157 |
| 158 // aura::WindowTreeHostObserver overrides: | 158 // aura::WindowTreeHostObserver overrides: |
| 159 void OnHostResized(const aura::WindowTreeHost* host) override; | 159 void OnHostResized(const aura::WindowTreeHost* host) override; |
| 160 | 160 |
| 161 // aura::DisplayManager::Delegate overrides: | 161 // ash::DisplayManager::Delegate overrides: |
| 162 void CreateOrUpdateMirroringDisplay( | 162 void CreateOrUpdateMirroringDisplay( |
| 163 const DisplayInfoList& info_list) override; | 163 const DisplayInfoList& info_list) override; |
| 164 void CloseMirroringDisplayIfNotNecessary() override; | 164 void CloseMirroringDisplayIfNotNecessary() override; |
| 165 void PreDisplayConfigurationChange(bool clear_focus) override; | 165 void PreDisplayConfigurationChange(bool clear_focus) override; |
| 166 void PostDisplayConfigurationChange() override; | 166 void PostDisplayConfigurationChange() override; |
| 167 #if defined(OS_CHROMEOS) | 167 #if defined(OS_CHROMEOS) |
| 168 ui::DisplayConfigurator* display_configurator() override; | 168 ui::DisplayConfigurator* display_configurator() override; |
| 169 #endif | 169 #endif |
| 170 std::string GetInternalDisplayNameString() override; |
| 171 std::string GetUnknownDisplayNameString() override; |
| 170 | 172 |
| 171 // ui::internal::InputMethodDelegate overrides: | 173 // ui::internal::InputMethodDelegate overrides: |
| 172 ui::EventDispatchDetails DispatchKeyEventPostIME( | 174 ui::EventDispatchDetails DispatchKeyEventPostIME( |
| 173 ui::KeyEvent* event) override; | 175 ui::KeyEvent* event) override; |
| 174 | 176 |
| 175 InputMethodEventHandler* input_method_event_handler() { | 177 InputMethodEventHandler* input_method_event_handler() { |
| 176 return input_method_event_handler_.get(); | 178 return input_method_event_handler_.get(); |
| 177 } | 179 } |
| 178 | 180 |
| 179 private: | 181 private: |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 int64_t cursor_display_id_for_restore_; | 224 int64_t cursor_display_id_for_restore_; |
| 223 | 225 |
| 224 base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_; | 226 base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_; |
| 225 | 227 |
| 226 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager); | 228 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager); |
| 227 }; | 229 }; |
| 228 | 230 |
| 229 } // namespace ash | 231 } // namespace ash |
| 230 | 232 |
| 231 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ | 233 #endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_ |
| OLD | NEW |