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

Unified Diff: chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc

Issue 1240393005: [Docking] Restores docked state for tab-less browser windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « no previous file | chrome/browser/ui/window_sizer/window_sizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a571c4e97e0b3ada595f131416dc94bb322b9957..1458f1d6af1db12715092fdfef4cdaf0d5bde950 100644
--- a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc
@@ -64,7 +64,7 @@ IN_PROC_BROWSER_TEST_P(BrowserViewTestParam, BrowserRemembersDockedState) {
browser()->profile(), browser()->host_desktop_type())
: Browser::CreateParams(browser()->profile(),
browser()->host_desktop_type());
- params.initial_show_state = ui::SHOW_STATE_NORMAL;
+ params.initial_show_state = ui::SHOW_STATE_DEFAULT;
bool is_ash = browser()->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH;
// Default |browser()| is not used by this test.
browser()->window()->Close();
@@ -84,11 +84,11 @@ IN_PROC_BROWSER_TEST_P(BrowserViewTestParam, BrowserRemembersDockedState) {
// Saved placement should reflect docked state (for app windows only in Ash).
gfx::Rect bounds;
- ui::WindowShowState show_state = ui::SHOW_STATE_NORMAL;
+ ui::WindowShowState show_state = ui::SHOW_STATE_DEFAULT;
const views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
widget->widget_delegate()->GetSavedWindowPlacement(widget, &bounds,
&show_state);
- EXPECT_EQ(is_ash && test_app ? ui::SHOW_STATE_DOCKED : ui::SHOW_STATE_NORMAL,
+ EXPECT_EQ(is_ash && test_app ? ui::SHOW_STATE_DOCKED : ui::SHOW_STATE_DEFAULT,
show_state);
// Docking is only relevant on Ash desktop.
if (!is_ash)
« no previous file with comments | « no previous file | chrome/browser/ui/window_sizer/window_sizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698