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

Unified Diff: content/browser/renderer_host/render_widget_host_view_win.cc

Issue 10270029: Fullscreen can't use the desktop as a parent in metro mode (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | ui/base/win/hwnd_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_win.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_view_win.cc (revision 134777)
+++ content/browser/renderer_host/render_widget_host_view_win.cc (working copy)
@@ -392,7 +392,7 @@
gfx::Rect pos = gfx::Screen::GetMonitorNearestWindow(
reference_host_view->GetNativeView()).bounds();
is_fullscreen_ = true;
- DoPopupOrFullscreenInit(GetDesktopWindow(), pos, 0);
+ DoPopupOrFullscreenInit(ui::GetWindowToParentTo(true), pos, 0);
}
RenderWidgetHost* RenderWidgetHostViewWin::GetRenderWidgetHost() const {
@@ -668,7 +668,7 @@
void RenderWidgetHostViewWin::Show() {
if (!is_fullscreen_) {
DCHECK(parent_hwnd_);
- DCHECK(parent_hwnd_ != GetDesktopWindow());
+ DCHECK(parent_hwnd_ != ui::GetWindowToParentTo(true));
SetParent(parent_hwnd_);
}
ShowWindow(SW_SHOW);
@@ -677,7 +677,7 @@
}
void RenderWidgetHostViewWin::Hide() {
- if (!is_fullscreen_ && GetParent() == GetDesktopWindow()) {
+ if (!is_fullscreen_ && GetParent() == ui::GetWindowToParentTo(true)) {
LOG(WARNING) << "Hide() called twice in a row: " << this << ":" <<
parent_hwnd_ << ":" << GetParent();
return;
« no previous file with comments | « no previous file | ui/base/win/hwnd_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698