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

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

Issue 16070003: Move immersive fullscreen check into ImmersiveFullscreenConfiguration. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: sync+rebase Created 7 years, 6 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/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "chrome/browser/ui/immersive_fullscreen_configuration.h"
8 #include "chrome/browser/ui/views/frame/top_container_view.h" 9 #include "chrome/browser/ui/views/frame/top_container_view.h"
9 #include "ui/aura/root_window.h" 10 #include "ui/aura/root_window.h"
10 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
11 12
12 // For now, immersive fullscreen is Chrome OS only. 13 // For now, immersive fullscreen is Chrome OS only.
13 #if defined(OS_CHROMEOS) 14 #if defined(OS_CHROMEOS)
14 15
15 ///////////////////////////////////////////////////////////////////////////// 16 /////////////////////////////////////////////////////////////////////////////
16 17
17 class MockImmersiveModeControllerDelegate 18 class MockImmersiveModeControllerDelegate
(...skipping 28 matching lines...) Expand all
46 ImmersiveModeControllerAshTest() : widget_(NULL), top_container_(NULL) {} 47 ImmersiveModeControllerAshTest() : widget_(NULL), top_container_(NULL) {}
47 virtual ~ImmersiveModeControllerAshTest() {} 48 virtual ~ImmersiveModeControllerAshTest() {}
48 49
49 ImmersiveModeControllerAsh* controller() { return controller_.get(); } 50 ImmersiveModeControllerAsh* controller() { return controller_.get(); }
50 MockImmersiveModeControllerDelegate* delegate() { return delegate_.get(); } 51 MockImmersiveModeControllerDelegate* delegate() { return delegate_.get(); }
51 52
52 // ash::test::AshTestBase overrides: 53 // ash::test::AshTestBase overrides:
53 virtual void SetUp() OVERRIDE { 54 virtual void SetUp() OVERRIDE {
54 ash::test::AshTestBase::SetUp(); 55 ash::test::AshTestBase::SetUp();
55 56
56 chrome::EnableImmersiveFullscreenForTest(); 57 ImmersiveFullscreenConfiguration::EnableImmersiveFullscreenForTest();
57 ASSERT_TRUE(chrome::UseImmersiveFullscreen()); 58 ASSERT_TRUE(ImmersiveFullscreenConfiguration::UseImmersiveFullscreen());
58 59
59 controller_.reset(new ImmersiveModeControllerAsh); 60 controller_.reset(new ImmersiveModeControllerAsh);
60 delegate_.reset(new MockImmersiveModeControllerDelegate); 61 delegate_.reset(new MockImmersiveModeControllerDelegate);
61 62
62 widget_ = new views::Widget(); 63 widget_ = new views::Widget();
63 views::Widget::InitParams params; 64 views::Widget::InitParams params;
64 params.context = CurrentContext(); 65 params.context = CurrentContext();
65 widget_->Init(params); 66 widget_->Init(params);
66 widget_->Show(); 67 widget_->Show();
67 68
(...skipping 29 matching lines...) Expand all
97 98
98 // Revealing shows the top views. 99 // Revealing shows the top views.
99 controller()->StartRevealForTest(true); 100 controller()->StartRevealForTest(true);
100 EXPECT_TRUE(controller()->IsRevealed()); 101 EXPECT_TRUE(controller()->IsRevealed());
101 EXPECT_FALSE(controller()->ShouldHideTopViews()); 102 EXPECT_FALSE(controller()->ShouldHideTopViews());
102 // Tabs are painting in the normal style during a reveal. 103 // Tabs are painting in the normal style during a reveal.
103 EXPECT_FALSE(delegate()->immersive_style()); 104 EXPECT_FALSE(delegate()->immersive_style());
104 } 105 }
105 106
106 #endif // defined(OS_CHROMEOS) 107 #endif // defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698