OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h" | 5 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h" |
6 | 6 |
7 #include "ash/ash_constants.h" | 7 #include "ash/common/ash_constants.h" |
| 8 #include "ash/common/wm_shell.h" |
8 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" | 9 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" |
9 #include "ash/frame/header_painter.h" | 10 #include "ash/frame/header_painter.h" |
10 #include "ash/shell.h" | 11 #include "ash/shell.h" |
11 #include "ash/test/immersive_fullscreen_controller_test_api.h" | 12 #include "ash/test/immersive_fullscreen_controller_test_api.h" |
12 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 13 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
13 #include "ash/wm_shell.h" | |
14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
15 #include "build/build_config.h" | 15 #include "build/build_config.h" |
16 #include "chrome/browser/profiles/profile_avatar_icon_util.h" | 16 #include "chrome/browser/profiles/profile_avatar_icon_util.h" |
17 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" | 17 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" |
18 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_test.h" | 18 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_test.h" |
19 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
20 #include "chrome/browser/ui/browser_commands.h" | 20 #include "chrome/browser/ui/browser_commands.h" |
21 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" | 21 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" |
22 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" | 22 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" |
23 #include "chrome/browser/ui/views/frame/browser_view.h" | 23 #include "chrome/browser/ui/views/frame/browser_view.h" |
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 bounds(); | 285 bounds(); |
286 EXPECT_GT(initial.width(), during_maximize.width()); | 286 EXPECT_GT(initial.width(), during_maximize.width()); |
287 ash::WmShell::Get() | 287 ash::WmShell::Get() |
288 ->maximize_mode_controller() | 288 ->maximize_mode_controller() |
289 ->EnableMaximizeModeWindowManager(false); | 289 ->EnableMaximizeModeWindowManager(false); |
290 test.EndAnimations(); | 290 test.EndAnimations(); |
291 const gfx::Rect after_restore = frame_view->caption_button_container_-> | 291 const gfx::Rect after_restore = frame_view->caption_button_container_-> |
292 bounds(); | 292 bounds(); |
293 EXPECT_EQ(initial, after_restore); | 293 EXPECT_EQ(initial, after_restore); |
294 } | 294 } |
OLD | NEW |