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

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

Issue 199283002: Remove ash::switches::UseImmersiveFullscreenForAllWindows() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/shelf/shelf_layout_manager.h" 9 #include "ash/shelf/shelf_layout_manager.h"
10 #include "ash/shelf/shelf_types.h" 10 #include "ash/shelf/shelf_types.h"
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 class ImmersiveModeControllerAshTestHostedApp 265 class ImmersiveModeControllerAshTestHostedApp
266 : public ImmersiveModeControllerAshTest { 266 : public ImmersiveModeControllerAshTest {
267 public: 267 public:
268 ImmersiveModeControllerAshTestHostedApp() 268 ImmersiveModeControllerAshTestHostedApp()
269 : ImmersiveModeControllerAshTest(Browser::TYPE_POPUP, 269 : ImmersiveModeControllerAshTest(Browser::TYPE_POPUP,
270 chrome::HOST_DESKTOP_TYPE_ASH, 270 chrome::HOST_DESKTOP_TYPE_ASH,
271 true) { 271 true) {
272 } 272 }
273 virtual ~ImmersiveModeControllerAshTestHostedApp() {} 273 virtual ~ImmersiveModeControllerAshTestHostedApp() {}
274 274
275 // ImmersiveModeControllerAshTest override:
276 virtual void SetUp() OVERRIDE {
277 CommandLine::ForCurrentProcess()->AppendSwitch(
278 ash::switches::kAshEnableImmersiveFullscreenForAllWindows);
279 ImmersiveModeControllerAshTest::SetUp();
280 }
281
282 private: 275 private:
283 DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerAshTestHostedApp); 276 DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerAshTestHostedApp);
284 }; 277 };
285 278
286 // Test the layout and visibility of the TopContainerView and web contents when 279 // Test the layout and visibility of the TopContainerView and web contents when
287 // a hosted app is put into immersive fullscreen. 280 // a hosted app is put into immersive fullscreen.
288 TEST_F(ImmersiveModeControllerAshTestHostedApp, Layout) { 281 TEST_F(ImmersiveModeControllerAshTestHostedApp, Layout) {
289 // Add a tab because the browser starts out without any tabs at all. 282 // Add a tab because the browser starts out without any tabs at all.
290 AddTab(browser(), GURL("about:blank")); 283 AddTab(browser(), GURL("about:blank"));
291 284
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 329
337 // Exit immersive fullscreen. The web contents should be back below the window 330 // Exit immersive fullscreen. The web contents should be back below the window
338 // header. 331 // header.
339 ToggleFullscreen(); 332 ToggleFullscreen();
340 EXPECT_FALSE(browser_view()->GetWidget()->IsFullscreen()); 333 EXPECT_FALSE(browser_view()->GetWidget()->IsFullscreen());
341 EXPECT_FALSE(controller()->IsEnabled()); 334 EXPECT_FALSE(controller()->IsEnabled());
342 EXPECT_FALSE(tabstrip->visible()); 335 EXPECT_FALSE(tabstrip->visible());
343 EXPECT_FALSE(toolbar->visible()); 336 EXPECT_FALSE(toolbar->visible());
344 EXPECT_EQ(header_height, GetBoundsInWidget(contents_web_view).y()); 337 EXPECT_EQ(header_height, GetBoundsInWidget(contents_web_view).y());
345 } 338 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698