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

Side by Side Diff: content/browser/renderer_host/render_widget_host.cc

Issue 8566011: Completes the GetWindowRect/GetRootWindowRect/GetScreenInfo changes I thought I had finished with... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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.h" 5 #include "content/browser/renderer_host/render_widget_host.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputStateChanged, 202 IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputStateChanged,
203 OnMsgTextInputStateChanged) 203 OnMsgTextInputStateChanged)
204 IPC_MESSAGE_HANDLER(ViewHostMsg_ImeCompositionRangeChanged, 204 IPC_MESSAGE_HANDLER(ViewHostMsg_ImeCompositionRangeChanged,
205 OnMsgImeCompositionRangeChanged) 205 OnMsgImeCompositionRangeChanged)
206 IPC_MESSAGE_HANDLER(ViewHostMsg_ImeCancelComposition, 206 IPC_MESSAGE_HANDLER(ViewHostMsg_ImeCancelComposition,
207 OnMsgImeCancelComposition) 207 OnMsgImeCancelComposition)
208 IPC_MESSAGE_HANDLER(ViewHostMsg_DidActivateAcceleratedCompositing, 208 IPC_MESSAGE_HANDLER(ViewHostMsg_DidActivateAcceleratedCompositing,
209 OnMsgDidActivateAcceleratedCompositing) 209 OnMsgDidActivateAcceleratedCompositing)
210 IPC_MESSAGE_HANDLER(ViewHostMsg_LockMouse, OnMsgLockMouse) 210 IPC_MESSAGE_HANDLER(ViewHostMsg_LockMouse, OnMsgLockMouse)
211 IPC_MESSAGE_HANDLER(ViewHostMsg_UnlockMouse, OnMsgUnlockMouse) 211 IPC_MESSAGE_HANDLER(ViewHostMsg_UnlockMouse, OnMsgUnlockMouse)
212 #if defined(OS_POSIX) 212 #if defined(OS_POSIX) || defined(USE_AURA)
213 IPC_MESSAGE_HANDLER(ViewHostMsg_GetScreenInfo, OnMsgGetScreenInfo) 213 IPC_MESSAGE_HANDLER(ViewHostMsg_GetScreenInfo, OnMsgGetScreenInfo)
214 IPC_MESSAGE_HANDLER(ViewHostMsg_GetWindowRect, OnMsgGetWindowRect) 214 IPC_MESSAGE_HANDLER(ViewHostMsg_GetWindowRect, OnMsgGetWindowRect)
215 IPC_MESSAGE_HANDLER(ViewHostMsg_GetRootWindowRect, OnMsgGetRootWindowRect) 215 IPC_MESSAGE_HANDLER(ViewHostMsg_GetRootWindowRect, OnMsgGetRootWindowRect)
216 #endif 216 #endif
217 #if defined(OS_MACOSX) 217 #if defined(OS_MACOSX)
218 IPC_MESSAGE_HANDLER(ViewHostMsg_PluginFocusChanged, 218 IPC_MESSAGE_HANDLER(ViewHostMsg_PluginFocusChanged,
219 OnMsgPluginFocusChanged) 219 OnMsgPluginFocusChanged)
220 IPC_MESSAGE_HANDLER(ViewHostMsg_StartPluginIme, 220 IPC_MESSAGE_HANDLER(ViewHostMsg_StartPluginIme,
221 OnMsgStartPluginIme) 221 OnMsgStartPluginIme)
222 IPC_MESSAGE_HANDLER(ViewHostMsg_AllocateFakePluginWindowHandle, 222 IPC_MESSAGE_HANDLER(ViewHostMsg_AllocateFakePluginWindowHandle,
(...skipping 992 matching lines...) Expand 10 before | Expand all | Expand 10 after
1215 } 1215 }
1216 1216
1217 pending_mouse_lock_request_ = true; 1217 pending_mouse_lock_request_ = true;
1218 RequestToLockMouse(); 1218 RequestToLockMouse();
1219 } 1219 }
1220 1220
1221 void RenderWidgetHost::OnMsgUnlockMouse() { 1221 void RenderWidgetHost::OnMsgUnlockMouse() {
1222 RejectMouseLockOrUnlockIfNecessary(); 1222 RejectMouseLockOrUnlockIfNecessary();
1223 } 1223 }
1224 1224
1225 #if defined(OS_POSIX) 1225 #if defined(OS_POSIX) || defined(USE_AURA)
1226 void RenderWidgetHost::OnMsgGetScreenInfo(gfx::NativeViewId window_id, 1226 void RenderWidgetHost::OnMsgGetScreenInfo(gfx::NativeViewId window_id,
1227 WebKit::WebScreenInfo* results) { 1227 WebKit::WebScreenInfo* results) {
1228 if (view_) 1228 if (view_)
1229 view_->GetScreenInfo(results); 1229 view_->GetScreenInfo(results);
1230 else 1230 else
1231 RenderWidgetHostView::GetDefaultScreenInfo(results); 1231 RenderWidgetHostView::GetDefaultScreenInfo(results);
1232 } 1232 }
1233 1233
1234 void RenderWidgetHost::OnMsgGetWindowRect(gfx::NativeViewId window_id, 1234 void RenderWidgetHost::OnMsgGetWindowRect(gfx::NativeViewId window_id,
1235 gfx::Rect* results) { 1235 gfx::Rect* results) {
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1469 pending_mouse_lock_request_ = false; 1469 pending_mouse_lock_request_ = false;
1470 if (!view_ || !view_->HasFocus()|| !view_->LockMouse()) { 1470 if (!view_ || !view_->HasFocus()|| !view_->LockMouse()) {
1471 Send(new ViewMsg_LockMouse_ACK(routing_id_, false)); 1471 Send(new ViewMsg_LockMouse_ACK(routing_id_, false));
1472 return false; 1472 return false;
1473 } else { 1473 } else {
1474 Send(new ViewMsg_LockMouse_ACK(routing_id_, true)); 1474 Send(new ViewMsg_LockMouse_ACK(routing_id_, true));
1475 return true; 1475 return true;
1476 } 1476 }
1477 } 1477 }
1478 } 1478 }
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host.h ('k') | content/browser/renderer_host/render_widget_host_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698