| 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/root_window_controller.h" | 5 #include "ash/root_window_controller.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/session/session_controller.h" | 10 #include "ash/common/session/session_controller.h" |
| 12 #include "ash/common/session/session_state_delegate.h" | 11 #include "ash/common/session/session_state_delegate.h" |
| 13 #include "ash/common/system/tray/system_tray_delegate.h" | 12 #include "ash/common/system/tray/system_tray_delegate.h" |
| 14 #include "ash/common/wm/system_modal_container_layout_manager.h" | 13 #include "ash/common/wm/system_modal_container_layout_manager.h" |
| 15 #include "ash/common/wm/window_state.h" | 14 #include "ash/common/wm/window_state.h" |
| 16 #include "ash/common/wm_lookup.h" | 15 #include "ash/common/wm_lookup.h" |
| 17 #include "ash/common/wm_shell.h" | 16 #include "ash/common/wm_shell.h" |
| 18 #include "ash/common/wm_window.h" | 17 #include "ash/common/wm_window.h" |
| 19 #include "ash/public/cpp/shell_window_ids.h" | 18 #include "ash/public/cpp/shell_window_ids.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 if (window_ == lost_focus) | 92 if (window_ == lost_focus) |
| 94 delete window_; | 93 delete window_; |
| 95 } | 94 } |
| 96 | 95 |
| 97 aura::Window* window_; | 96 aura::Window* window_; |
| 98 | 97 |
| 99 DISALLOW_COPY_AND_ASSIGN(DeleteOnBlurDelegate); | 98 DISALLOW_COPY_AND_ASSIGN(DeleteOnBlurDelegate); |
| 100 }; | 99 }; |
| 101 | 100 |
| 102 WmLayoutManager* GetLayoutManager(RootWindowController* controller, int id) { | 101 WmLayoutManager* GetLayoutManager(RootWindowController* controller, int id) { |
| 103 return WmWindowAura::Get(controller->GetContainer(id))->GetLayoutManager(); | 102 return WmWindow::Get(controller->GetContainer(id))->GetLayoutManager(); |
| 104 } | 103 } |
| 105 | 104 |
| 106 } // namespace | 105 } // namespace |
| 107 | 106 |
| 108 namespace test { | 107 namespace test { |
| 109 | 108 |
| 110 class RootWindowControllerTest : public AshMDTestBase { | 109 class RootWindowControllerTest : public AshMDTestBase { |
| 111 public: | 110 public: |
| 112 views::Widget* CreateTestWidget(const gfx::Rect& bounds) { | 111 views::Widget* CreateTestWidget(const gfx::Rect& bounds) { |
| 113 views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds( | 112 views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds( |
| (...skipping 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1243 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( | 1242 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( |
| 1244 gfx::Rect(0, 400, 800, 200)); | 1243 gfx::Rect(0, 400, 800, 200)); |
| 1245 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); | 1244 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); |
| 1246 | 1245 |
| 1247 UpdateDisplay("600x800"); | 1246 UpdateDisplay("600x800"); |
| 1248 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); | 1247 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); |
| 1249 } | 1248 } |
| 1250 | 1249 |
| 1251 } // namespace test | 1250 } // namespace test |
| 1252 } // namespace ash | 1251 } // namespace ash |
| OLD | NEW |