| 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 "ash/display/window_tree_host_manager.h" |     5 #include "ash/display/window_tree_host_manager.h" | 
|     6  |     6  | 
|     7 #include <memory> |     7 #include <memory> | 
|     8  |     8  | 
|     9 #include "ash/aura/wm_window_aura.h" |  | 
|    10 #include "ash/common/material_design/material_design_controller.h" |     9 #include "ash/common/material_design/material_design_controller.h" | 
|    11 #include "ash/common/shelf/shelf_widget.h" |    10 #include "ash/common/shelf/shelf_widget.h" | 
|    12 #include "ash/common/shelf/wm_shelf.h" |    11 #include "ash/common/shelf/wm_shelf.h" | 
|    13 #include "ash/common/wm/window_state.h" |    12 #include "ash/common/wm/window_state.h" | 
|    14 #include "ash/common/wm/wm_event.h" |    13 #include "ash/common/wm/wm_event.h" | 
|    15 #include "ash/common/wm/wm_screen_util.h" |    14 #include "ash/common/wm/wm_screen_util.h" | 
 |    15 #include "ash/common/wm_window.h" | 
|    16 #include "ash/display/display_util.h" |    16 #include "ash/display/display_util.h" | 
|    17 #include "ash/screen_util.h" |    17 #include "ash/screen_util.h" | 
|    18 #include "ash/shell.h" |    18 #include "ash/shell.h" | 
|    19 #include "ash/test/ash_md_test_base.h" |    19 #include "ash/test/ash_md_test_base.h" | 
|    20 #include "ash/test/ash_test_base.h" |    20 #include "ash/test/ash_test_base.h" | 
|    21 #include "ash/test/ash_test_helper.h" |    21 #include "ash/test/ash_test_helper.h" | 
|    22 #include "ash/test/cursor_manager_test_api.h" |    22 #include "ash/test/cursor_manager_test_api.h" | 
|    23 #include "ash/test/test_shell_delegate.h" |    23 #include "ash/test/test_shell_delegate.h" | 
|    24 #include "ash/wm/window_state_aura.h" |    24 #include "ash/wm/window_state_aura.h" | 
|    25 #include "base/command_line.h" |    25 #include "base/command_line.h" | 
| (...skipping 1535 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1561  |  1561  | 
|  1562 class RootWindowTestObserver : public aura::WindowObserver { |  1562 class RootWindowTestObserver : public aura::WindowObserver { | 
|  1563  public: |  1563  public: | 
|  1564   RootWindowTestObserver() {} |  1564   RootWindowTestObserver() {} | 
|  1565   ~RootWindowTestObserver() override {} |  1565   ~RootWindowTestObserver() override {} | 
|  1566  |  1566  | 
|  1567   void OnWindowBoundsChanged(aura::Window* window, |  1567   void OnWindowBoundsChanged(aura::Window* window, | 
|  1568                              const gfx::Rect& old_bounds, |  1568                              const gfx::Rect& old_bounds, | 
|  1569                              const gfx::Rect& new_bounds) override { |  1569                              const gfx::Rect& new_bounds) override { | 
|  1570     shelf_display_bounds_ = |  1570     shelf_display_bounds_ = | 
|  1571         wm::GetDisplayBoundsWithShelf(WmWindowAura::Get(window)); |  1571         wm::GetDisplayBoundsWithShelf(WmWindow::Get(window)); | 
|  1572   } |  1572   } | 
|  1573  |  1573  | 
|  1574   const gfx::Rect& shelf_display_bounds() const { |  1574   const gfx::Rect& shelf_display_bounds() const { | 
|  1575     return shelf_display_bounds_; |  1575     return shelf_display_bounds_; | 
|  1576   } |  1576   } | 
|  1577  |  1577  | 
|  1578  private: |  1578  private: | 
|  1579   gfx::Rect shelf_display_bounds_; |  1579   gfx::Rect shelf_display_bounds_; | 
|  1580  |  1580  | 
|  1581   DISALLOW_COPY_AND_ASSIGN(RootWindowTestObserver); |  1581   DISALLOW_COPY_AND_ASSIGN(RootWindowTestObserver); | 
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1793       widget->GetNativeWindow()->GetRootWindow()); |  1793       widget->GetNativeWindow()->GetRootWindow()); | 
|  1794   event_generator.MoveMouseToCenterOf(widget->GetNativeWindow()); |  1794   event_generator.MoveMouseToCenterOf(widget->GetNativeWindow()); | 
|  1795  |  1795  | 
|  1796   UpdateDisplay("300x300"); |  1796   UpdateDisplay("300x300"); | 
|  1797   watcher.Stop(); |  1797   watcher.Stop(); | 
|  1798  |  1798  | 
|  1799   widget->CloseNow(); |  1799   widget->CloseNow(); | 
|  1800 } |  1800 } | 
|  1801  |  1801  | 
|  1802 }  // namespace ash |  1802 }  // namespace ash | 
| OLD | NEW |