chrome/browser/ui/views/panels/panel_view.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

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/panels/panel_view.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix other os's Created 8 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

« chrome/browser/ui/views/fullscreen_exit_bubble_views.cc ('K') | « chrome/browser/ui/views/fullscreen_exit_bubble_views.cc ('k') | chrome/browser/ui/views/status_icons/status_tray_win.cc » ('j') | content/browser/web_contents/web_contents_view_aura.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/panels/panel_view.cc

diff --git a/chrome/browser/ui/views/panels/panel_view.cc b/chrome/browser/ui/views/panels/panel_view.cc

index e64873d9a5fb88af872ef67ee75b0760d5ecc1bc..ff16e3a576fcd84ae82db17db698ef2dc705cc0f 100644

--- a/chrome/browser/ui/views/panels/panel_view.cc

+++ b/chrome/browser/ui/views/panels/panel_view.cc

@@ -651,8 +651,9 @@ void PanelView::OnWidgetActivationChanged(views::Widget* widget, bool active) {

// When the user clicks on the minimized panel, the panel expansion will be

// done when we process the mouse button pressed message.

if (focused_ && panel_->IsMinimized() &&

- gfx::Screen::GetWindowAtCursorScreenPoint() !=

- widget->GetNativeWindow()) {

+ gfx::Screen::GetWindowAtCursorScreenPoint(

+ gfx::Screen::BadTwoWorldsContext()) !=

+ widget->GetNativeWindow()) {

panel_->Restore();

}