| 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/common/session/session_state_delegate.h" |     9 #include "ash/common/session/session_state_delegate.h" | 
|    10 #include "ash/common/shell_window_ids.h" |    10 #include "ash/common/shell_window_ids.h" | 
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   192   UpdateDisplay("600x600"); |   192   UpdateDisplay("600x600"); | 
|   193  |   193  | 
|   194   // d2 must have been deleted. |   194   // d2 must have been deleted. | 
|   195   EXPECT_FALSE(tracker.Contains(d2)); |   195   EXPECT_FALSE(tracker.Contains(d2)); | 
|   196  |   196  | 
|   197   EXPECT_EQ(root_windows[0], normal->GetNativeView()->GetRootWindow()); |   197   EXPECT_EQ(root_windows[0], normal->GetNativeView()->GetRootWindow()); | 
|   198   EXPECT_EQ("100,20 100x100", normal->GetWindowBoundsInScreen().ToString()); |   198   EXPECT_EQ("100,20 100x100", normal->GetWindowBoundsInScreen().ToString()); | 
|   199   EXPECT_EQ("100,20 100x100", |   199   EXPECT_EQ("100,20 100x100", | 
|   200             normal->GetNativeView()->GetBoundsInRootWindow().ToString()); |   200             normal->GetNativeView()->GetBoundsInRootWindow().ToString()); | 
|   201  |   201  | 
|   202   // Maximized area on primary display has 47px (ash::kShelfSize) inset at the |   202   // Maximized area on primary display has 47px for non-md and 48px for md | 
|   203   // bottom. |   203   // (defined in ash::SHELF_SIZE) inset at the bottom. | 
|   204  |   204  | 
|   205   // First clear fullscreen status, since both fullscreen and maximized windows |   205   // First clear fullscreen status, since both fullscreen and maximized windows | 
|   206   // share the same desktop workspace, which cancels the shelf status. |   206   // share the same desktop workspace, which cancels the shelf status. | 
|   207   fullscreen->SetFullscreen(false); |   207   fullscreen->SetFullscreen(false); | 
|   208   EXPECT_EQ(root_windows[0], maximized->GetNativeView()->GetRootWindow()); |   208   EXPECT_EQ(root_windows[0], maximized->GetNativeView()->GetRootWindow()); | 
|   209   EXPECT_EQ("0,0 600x553", maximized->GetWindowBoundsInScreen().ToString()); |   209   EXPECT_EQ("0,0 600x553", maximized->GetWindowBoundsInScreen().ToString()); | 
|   210   EXPECT_EQ("0,0 600x553", |   210   EXPECT_EQ("0,0 600x553", | 
|   211             maximized->GetNativeView()->GetBoundsInRootWindow().ToString()); |   211             maximized->GetNativeView()->GetBoundsInRootWindow().ToString()); | 
|   212  |   212  | 
|   213   // Set fullscreen to true, but maximized window's size won't change because |   213   // Set fullscreen to true, but maximized window's size won't change because | 
| (...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1043   keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( |  1043   keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( | 
|  1044       gfx::Rect(0, 400, 800, 200)); |  1044       gfx::Rect(0, 400, 800, 200)); | 
|  1045   EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); |  1045   EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); | 
|  1046  |  1046  | 
|  1047   UpdateDisplay("600x800"); |  1047   UpdateDisplay("600x800"); | 
|  1048   EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); |  1048   EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); | 
|  1049 } |  1049 } | 
|  1050  |  1050  | 
|  1051 }  // namespace test |  1051 }  // namespace test | 
|  1052 }  // namespace ash |  1052 }  // namespace ash | 
| OLD | NEW |