Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Side by Side Diff: chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc

Issue 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/immersive_mode_controller_ash.h" 5 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
6 6
7 #include "ash/common/ash_switches.h" 7 #include "ash/common/ash_switches.h"
8 #include "ash/common/material_design/material_design_controller.h" 8 #include "ash/common/material_design/material_design_controller.h"
9 #include "ash/common/shelf/shelf_layout_manager.h"
9 #include "ash/common/shelf/shelf_types.h" 10 #include "ash/common/shelf/shelf_types.h"
10 #include "ash/root_window_controller.h" 11 #include "ash/root_window_controller.h"
11 #include "ash/shelf/shelf_layout_manager.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/test/ash_test_base.h" 13 #include "ash/test/ash_test_base.h"
14 #include "ash/test/immersive_fullscreen_controller_test_api.h" 14 #include "ash/test/immersive_fullscreen_controller_test_api.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "chrome/app/chrome_command_ids.h" 17 #include "chrome/app/chrome_command_ids.h"
18 #include "chrome/browser/ui/browser_commands.h" 18 #include "chrome/browser/ui/browser_commands.h"
19 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" 19 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
20 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" 20 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h"
21 #include "chrome/browser/ui/views/frame/browser_view.h" 21 #include "chrome/browser/ui/views/frame/browser_view.h"
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 376
377 // Exit immersive fullscreen. The web contents should be back below the window 377 // Exit immersive fullscreen. The web contents should be back below the window
378 // header. 378 // header.
379 ToggleFullscreen(); 379 ToggleFullscreen();
380 EXPECT_FALSE(browser_view()->GetWidget()->IsFullscreen()); 380 EXPECT_FALSE(browser_view()->GetWidget()->IsFullscreen());
381 EXPECT_FALSE(controller()->IsEnabled()); 381 EXPECT_FALSE(controller()->IsEnabled());
382 EXPECT_FALSE(tabstrip->visible()); 382 EXPECT_FALSE(tabstrip->visible());
383 EXPECT_FALSE(toolbar->visible()); 383 EXPECT_FALSE(toolbar->visible());
384 EXPECT_EQ(header_height, GetBoundsInWidget(contents_web_view).y()); 384 EXPECT_EQ(header_height, GetBoundsInWidget(contents_web_view).y());
385 } 385 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/shelf_browsertest.cc ('k') | chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698