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

Unified Diff: chrome/browser/ui/views/frame/browser_view_interactive_uitest.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, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
diff --git a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
index 93d354bfeec2b494b53300aa9ebdaabbbcf1d8ff..0e21638721e92f59d4026d98b1fd4da39c693b41 100644
--- a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/autocomplete/autocomplete_controller.h"
#include "chrome/browser/search/search.h"
#include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/immersive_fullscreen_configuration.h"
#include "chrome/browser/ui/omnibox/omnibox_view.h"
#include "chrome/browser/ui/search/instant_test_utils.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -172,7 +173,7 @@ class BrowserViewImmersiveInstantExtendedTest : public InProcessBrowserTest,
virtual ~BrowserViewImmersiveInstantExtendedTest() {}
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
- chrome::EnableImmersiveFullscreenForTest();
+ ImmersiveFullscreenConfiguration::EnableImmersiveFullscreenForTest();
chrome::EnableInstantExtendedAPIForTesting();
ASSERT_TRUE(https_test_server().Start());
GURL instant_url = https_test_server().GetURL(
@@ -196,7 +197,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewImmersiveInstantExtendedTest,
// Start up both instant and immersive fullscreen.
ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
- ASSERT_TRUE(chrome::UseImmersiveFullscreen());
+ ASSERT_TRUE(ImmersiveFullscreenConfiguration::UseImmersiveFullscreen());
chrome::ToggleFullscreenMode(browser());
ASSERT_TRUE(browser_view->IsFullscreen());
ASSERT_TRUE(browser_view->immersive_mode_controller()->IsEnabled());
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/frame/immersive_mode_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698