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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_win.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: win fix 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_view_win.h" 5 #include "content/browser/renderer_host/render_widget_host_view_win.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <peninputpanel_i.c> 9 #include <peninputpanel_i.c>
10 #include <stack> 10 #include <stack>
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 539
540 void RenderWidgetHostViewWin::InitAsPopup( 540 void RenderWidgetHostViewWin::InitAsPopup(
541 RenderWidgetHostView* parent_host_view, const gfx::Rect& pos) { 541 RenderWidgetHostView* parent_host_view, const gfx::Rect& pos) {
542 close_on_deactivate_ = true; 542 close_on_deactivate_ = true;
543 DoPopupOrFullscreenInit(parent_host_view->GetNativeView(), pos, 543 DoPopupOrFullscreenInit(parent_host_view->GetNativeView(), pos,
544 WS_EX_TOOLWINDOW); 544 WS_EX_TOOLWINDOW);
545 } 545 }
546 546
547 void RenderWidgetHostViewWin::InitAsFullscreen( 547 void RenderWidgetHostViewWin::InitAsFullscreen(
548 RenderWidgetHostView* reference_host_view) { 548 RenderWidgetHostView* reference_host_view) {
549 gfx::Rect pos = gfx::Screen::GetDisplayNearestWindow( 549 gfx::Rect pos = gfx::Screen::GetNativeScreen()->GetDisplayNearestWindow(
550 reference_host_view->GetNativeView()).bounds(); 550 reference_host_view->GetNativeView()).bounds();
551 is_fullscreen_ = true; 551 is_fullscreen_ = true;
552 DoPopupOrFullscreenInit(ui::GetWindowToParentTo(true), pos, 0); 552 DoPopupOrFullscreenInit(ui::GetWindowToParentTo(true), pos, 0);
553 } 553 }
554 554
555 RenderWidgetHost* RenderWidgetHostViewWin::GetRenderWidgetHost() const { 555 RenderWidgetHost* RenderWidgetHostViewWin::GetRenderWidgetHost() const {
556 return render_widget_host_; 556 return render_widget_host_;
557 } 557 }
558 558
559 void RenderWidgetHostViewWin::WasShown() { 559 void RenderWidgetHostViewWin::WasShown() {
(...skipping 2559 matching lines...) Expand 10 before | Expand all | Expand 10 after
3119 // receive a focus change in the context of a pointer down message, it means 3119 // receive a focus change in the context of a pointer down message, it means
3120 // that the pointer down message occurred on the edit field and we should 3120 // that the pointer down message occurred on the edit field and we should
3121 // display the on screen keyboard 3121 // display the on screen keyboard
3122 if (!received_focus_change_after_pointer_down_ && virtual_keyboard_) 3122 if (!received_focus_change_after_pointer_down_ && virtual_keyboard_)
3123 DisplayOnScreenKeyboardIfNeeded(); 3123 DisplayOnScreenKeyboardIfNeeded();
3124 received_focus_change_after_pointer_down_ = false; 3124 received_focus_change_after_pointer_down_ = false;
3125 pointer_down_context_ = false; 3125 pointer_down_context_ = false;
3126 } 3126 }
3127 3127
3128 } // namespace content 3128 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698