chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc - Issue 38073004: Not moving a docked window when restoring a previously maximized window

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 38073004: Not moving a docked window when restoring a previously maximized window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Not moving a docked window when restoring a previously maximized window (delegating IsDocked to non… Created 7 years, 2 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/frame/browser_non_client_frame_view_ash.h ('k') | chrome/browser/ui/views/tabs/tab_drag_controller.cc » ('j') | ui/views/widget/widget.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

index e9ceab0d590de3104e936104f5bbe5d2fae1e62b..edf03a53eca21284bd9d975a23e6814a66b7907a 100644

--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

@@ -8,6 +8,7 @@

#include "ash/wm/caption_buttons/frame_caption_button_container_view.h"

#include "ash/wm/frame_border_hit_test_controller.h"

#include "ash/wm/header_painter.h"

+#include "ash/wm/window_state.h"

#include "chrome/browser/themes/theme_properties.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/views/avatar_label.h"

@@ -235,6 +236,10 @@ void BrowserNonClientFrameViewAsh::UpdateWindowTitle() {

header_painter_->SchedulePaintForTitle(BrowserFrame::GetTitleFont());

}

+bool BrowserNonClientFrameViewAsh::IsDocked() const {

+ return ash::wm::GetWindowState(frame()->GetNativeWindow())->IsDocked();

///////////////////////////////////////////////////////////////////////////////

// views::View overrides: