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

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

Issue 2690443002: cros-md: Remove the non-MD immersive mode code paths (Closed)
Patch Set: rebase & code comments Created 3 years, 10 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
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_controller.h ('k') | chrome/browser/ui/views/tabs/tab_strip.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
index 3f0edc3d7128169fe4240bbb97ec47eaad1642df..ebfe2329221fac7617a2881a5a28234af636ecca 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -63,7 +63,6 @@
#if defined(USE_ASH)
#include "ash/common/ash_switches.h"
-#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
@@ -2104,10 +2103,6 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserInSeparateDisplayTabDragControllerTest,
ASSERT_TRUE(immersive_controller2->IsEnabled());
ASSERT_FALSE(immersive_controller2->IsRevealed());
ASSERT_TRUE(tab_strip2->visible());
- bool is_using_material_design =
- ash::MaterialDesignController::IsImmersiveModeMaterial();
- if (!is_using_material_design)
- ASSERT_TRUE(tab_strip2->IsImmersiveStyle());
// Move to the first tab and drag it enough so that it detaches, but not
// enough that it attaches to browser2.
@@ -2127,7 +2122,6 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserInSeparateDisplayTabDragControllerTest,
// browser2's top chrome should be revealed and the tab strip should be
// at normal height while user is tragging tabs_strip2's tabs.
ASSERT_TRUE(immersive_controller2->IsRevealed());
- ASSERT_FALSE(tab_strip2->IsImmersiveStyle());
ASSERT_TRUE(tab_strip2->visible());
// Release the mouse, stopping the drag session.
@@ -2152,8 +2146,6 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserInSeparateDisplayTabDragControllerTest,
EXPECT_TRUE(immersive_controller2->IsEnabled());
EXPECT_FALSE(immersive_controller2->IsRevealed());
EXPECT_TRUE(tab_strip2->visible());
- if (!is_using_material_design)
- EXPECT_TRUE(tab_strip2->IsImmersiveStyle());
}
// Subclass of DetachToBrowserTabDragControllerTest that
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_controller.h ('k') | chrome/browser/ui/views/tabs/tab_strip.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698