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

Side by Side Diff: chrome/browser/ui/views/immersive_mode_controller_browsertest.cc

Issue 11969006: cros: Trigger immersive mode with F4 maximize key (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
OLDNEW
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 "chrome/browser/ui/views/immersive_mode_controller.h" 5 #include "chrome/browser/ui/views/immersive_mode_controller.h"
6 6
7 #include "chrome/browser/ui/views/frame/browser_view.h" 7 #include "chrome/browser/ui/views/frame/browser_view.h"
8 #include "chrome/browser/ui/views/tabs/tab.h" 8 #include "chrome/browser/ui/views/tabs/tab.h"
9 #include "chrome/browser/ui/views/tabs/tab_strip.h" 9 #include "chrome/browser/ui/views/tabs/tab_strip.h"
10 #include "chrome/test/base/in_process_browser_test.h" 10 #include "chrome/test/base/in_process_browser_test.h"
11 #include "ui/compositor/layer_animator.h" 11 #include "ui/compositor/layer_animator.h"
12 #include "ui/gfx/rect.h" 12 #include "ui/gfx/rect.h"
13 #include "ui/views/view.h" 13 #include "ui/views/view.h"
14 14
15 #if defined(USE_ASH) 15 #if defined(USE_ASH)
16 #include "ash/root_window_controller.h" 16 #include "ash/root_window_controller.h"
17 #include "ash/shelf_types.h" 17 #include "ash/shelf_types.h"
18 #include "ash/shell.h" 18 #include "ash/shell.h"
19 #include "ash/wm/shelf_layout_manager.h" 19 #include "ash/wm/shelf_layout_manager.h"
20 #include "ash/wm/window_properties.h"
20 #endif 21 #endif
21 22
22 namespace { 23 namespace {
23 24
24 // Returns the bounds of |view| in widget coordinates. 25 // Returns the bounds of |view| in widget coordinates.
25 gfx::Rect GetRectInWidget(views::View* view) { 26 gfx::Rect GetRectInWidget(views::View* view) {
26 return view->ConvertRectToWidget(view->GetLocalBounds()); 27 return view->ConvertRectToWidget(view->GetLocalBounds());
27 } 28 }
28 29
29 } // namespace 30 } // namespace
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 EXPECT_TRUE(browser_view->IsToolbarVisible()); 176 EXPECT_TRUE(browser_view->IsToolbarVisible());
176 #endif // defined(USE_AURA) && !defined(OS_WIN) 177 #endif // defined(USE_AURA) && !defined(OS_WIN)
177 178
178 // Don't crash if we exit the test during a reveal. 179 // Don't crash if we exit the test during a reveal.
179 browser_view->GetWidget()->Maximize(); 180 browser_view->GetWidget()->Maximize();
180 controller->SetEnabled(true); 181 controller->SetEnabled(true);
181 controller->StartRevealForTest(); 182 controller->StartRevealForTest();
182 } 183 }
183 184
184 #if defined(USE_ASH) 185 #if defined(USE_ASH)
185 // Test shelf auto-hide toggling behavior. 186 // Ash-specific immersive mode tests.
186 IN_PROC_BROWSER_TEST_F(ImmersiveModeControllerTest, ImmersiveShelf) { 187 IN_PROC_BROWSER_TEST_F(ImmersiveModeControllerTest, ImmersiveAsh) {
187 #if defined(OS_WIN) 188 #if defined(OS_WIN)
188 // Not running in Ash, so this doesn't doesn't make sense. 189 // Not running in Ash, so this doesn't doesn't make sense.
189 if (!ash::Shell::HasInstance()) 190 if (!ash::Shell::HasInstance())
190 return; 191 return;
191 #endif 192 #endif
192 ui::LayerAnimator::set_disable_animations_for_test(true); 193 ui::LayerAnimator::set_disable_animations_for_test(true);
193 194
194 BrowserView* browser_view = static_cast<BrowserView*>(browser()->window()); 195 BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
195 ImmersiveModeController* immersive_controller = 196 ImmersiveModeController* immersive_controller =
196 browser_view->immersive_mode_controller(); 197 browser_view->immersive_mode_controller();
(...skipping 16 matching lines...) Expand all
213 shelf->SetAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); 214 shelf->SetAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
214 EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state()); 215 EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
215 216
216 // Enabling immersive mode keeps auto-hide. 217 // Enabling immersive mode keeps auto-hide.
217 immersive_controller->SetEnabled(true); 218 immersive_controller->SetEnabled(true);
218 EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state()); 219 EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
219 220
220 // Disabling immersive mode maintains the user's auto-hide selection. 221 // Disabling immersive mode maintains the user's auto-hide selection.
221 immersive_controller->SetEnabled(false); 222 immersive_controller->SetEnabled(false);
222 EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state()); 223 EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
224
225 // Setting the window property directly toggles immersive mode.
226 aura::Window* window = browser_view->GetWidget()->GetNativeWindow();
227 window->SetProperty(ash::internal::kImmersiveModeKey, true);
228 EXPECT_TRUE(immersive_controller->enabled());
229 window->SetProperty(ash::internal::kImmersiveModeKey, false);
230 EXPECT_FALSE(immersive_controller->enabled());
223 } 231 }
224 #endif // defined(OS_CHROMEOS) 232
233 #endif // defined(USE_ASH)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698