| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 COMPONENTS_EXO_SHELL_SURFACE_H_ | 5 #ifndef COMPONENTS_EXO_SHELL_SURFACE_H_ |
| 6 #define COMPONENTS_EXO_SHELL_SURFACE_H_ | 6 #define COMPONENTS_EXO_SHELL_SURFACE_H_ |
| 7 | 7 |
| 8 #include <cstdint> | 8 #include <cstdint> |
| 9 #include <deque> | 9 #include <deque> |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 void OnWindowActivated( | 264 void OnWindowActivated( |
| 265 aura::Window* gained_active, | 265 aura::Window* gained_active, |
| 266 aura::Window* lost_active) override; | 266 aura::Window* lost_active) override; |
| 267 | 267 |
| 268 // Overridden from WMHelper::DisplayConfigurationObserver: | 268 // Overridden from WMHelper::DisplayConfigurationObserver: |
| 269 void OnDisplayConfigurationChanged() override; | 269 void OnDisplayConfigurationChanged() override; |
| 270 | 270 |
| 271 // Overridden from ui::EventHandler: | 271 // Overridden from ui::EventHandler: |
| 272 void OnKeyEvent(ui::KeyEvent* event) override; | 272 void OnKeyEvent(ui::KeyEvent* event) override; |
| 273 void OnMouseEvent(ui::MouseEvent* event) override; | 273 void OnMouseEvent(ui::MouseEvent* event) override; |
| 274 void OnGestureEvent(ui::GestureEvent* event) override; |
| 274 | 275 |
| 275 // Overridden from ui::AcceleratorTarget: | 276 // Overridden from ui::AcceleratorTarget: |
| 276 bool AcceleratorPressed(const ui::Accelerator& accelerator) override; | 277 bool AcceleratorPressed(const ui::Accelerator& accelerator) override; |
| 277 | 278 |
| 278 aura::Window* shadow_overlay() { return shadow_overlay_.get(); } | 279 aura::Window* shadow_overlay() { return shadow_overlay_.get(); } |
| 279 aura::Window* shadow_underlay() { return shadow_underlay_.get(); } | 280 aura::Window* shadow_underlay() { return shadow_underlay_.get(); } |
| 280 | 281 |
| 281 Surface* surface_for_testing() { return root_surface(); } | 282 Surface* surface_for_testing() { return root_surface(); } |
| 282 | 283 |
| 283 private: | 284 private: |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 bool pending_shadow_underlay_in_surface_ = true; | 377 bool pending_shadow_underlay_in_surface_ = true; |
| 377 bool system_modal_ = false; | 378 bool system_modal_ = false; |
| 378 gfx::ImageSkia icon_; | 379 gfx::ImageSkia icon_; |
| 379 | 380 |
| 380 DISALLOW_COPY_AND_ASSIGN(ShellSurface); | 381 DISALLOW_COPY_AND_ASSIGN(ShellSurface); |
| 381 }; | 382 }; |
| 382 | 383 |
| 383 } // namespace exo | 384 } // namespace exo |
| 384 | 385 |
| 385 #endif // COMPONENTS_EXO_SHELL_SURFACE_H_ | 386 #endif // COMPONENTS_EXO_SHELL_SURFACE_H_ |
| OLD | NEW |