diff options
| author | varkha <varkha@chromium.org> | 2015-07-21 13:09:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-21 20:11:36 +0000 |
| commit | e8561982b478352dc1d159c3b060b094c3bff3ff (patch) | |
| tree | 9dac627744493550d601c3b92eff5ed66051f9dc | |
| parent | 4763eed90e0af187322ae3411e2f87485433346f (diff) | |
| download | chromium_src-e8561982b478352dc1d159c3b060b094c3bff3ff.zip chromium_src-e8561982b478352dc1d159c3b060b094c3bff3ff.tar.gz chromium_src-e8561982b478352dc1d159c3b060b094c3bff3ff.tar.bz2 | |
[Docking] Restores docked state for tab-less browser windows
The CL that was supposed to fix that collided in CQ with
https://codereview.chromium.org/1209033008. After that CL apps launched
in a window have SHOW_STATE_DEFAULT initially and not SHOW_STATE_NORMAL
as was assumed in https://codereview.chromium.org/1221193009.
This patch makes the code path for docked state similar to maximized
state and updates that unit test.
BUG=271582
Review URL: https://codereview.chromium.org/1240393005
Cr-Commit-Position: refs/heads/master@{#339727}
| -rw-r--r-- | chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/ui/window_sizer/window_sizer.cc | 2 |
2 files changed, 4 insertions, 4 deletions
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 a571c4e..1458f1d 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) diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc index dc11ba7..0bee4fb 100644 --- a/chrome/browser/ui/window_sizer/window_sizer.cc +++ b/chrome/browser/ui/window_sizer/window_sizer.cc @@ -77,7 +77,7 @@ class DefaultStateProvider : public WindowSizer::StateProvider { *show_state = ui::SHOW_STATE_MAXIMIZED; bool docked = false; wp_pref->GetBoolean("docked", &docked); - if (*show_state == ui::SHOW_STATE_NORMAL && docked && + if (*show_state == ui::SHOW_STATE_DEFAULT && docked && !browser_->is_type_tabbed() && browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) { *show_state = ui::SHOW_STATE_DOCKED; |