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

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

Issue 99953002: Revert 238143 "Merge 237646 "Ensure that the OSK on Windows 8 sh..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1700/src/
Patch Set: Created 7 years 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
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "ui/base/ui_base_switches.h" 76 #include "ui/base/ui_base_switches.h"
77 #include "ui/gfx/image/image_skia.h" 77 #include "ui/gfx/image/image_skia.h"
78 #include "ui/gfx/native_widget_types.h" 78 #include "ui/gfx/native_widget_types.h"
79 #include "ui/shell_dialogs/selected_file_info.h" 79 #include "ui/shell_dialogs/selected_file_info.h"
80 #include "webkit/browser/fileapi/isolated_context.h" 80 #include "webkit/browser/fileapi/isolated_context.h"
81 81
82 #if defined(OS_MACOSX) 82 #if defined(OS_MACOSX)
83 #include "content/browser/renderer_host/popup_menu_helper_mac.h" 83 #include "content/browser/renderer_host/popup_menu_helper_mac.h"
84 #elif defined(OS_ANDROID) 84 #elif defined(OS_ANDROID)
85 #include "content/browser/media/android/browser_media_player_manager.h" 85 #include "content/browser/media/android/browser_media_player_manager.h"
86 #elif defined(OS_WIN)
87 #include "base/win/win_util.h"
88 #endif 86 #endif
89 87
90 using base::TimeDelta; 88 using base::TimeDelta;
91 using WebKit::WebConsoleMessage; 89 using WebKit::WebConsoleMessage;
92 using WebKit::WebDragOperation; 90 using WebKit::WebDragOperation;
93 using WebKit::WebDragOperationNone; 91 using WebKit::WebDragOperationNone;
94 using WebKit::WebDragOperationsMask; 92 using WebKit::WebDragOperationsMask;
95 using WebKit::WebInputEvent; 93 using WebKit::WebInputEvent;
96 using WebKit::WebMediaPlayerAction; 94 using WebKit::WebMediaPlayerAction;
97 using WebKit::WebPluginAction; 95 using WebKit::WebPluginAction;
(...skipping 1124 matching lines...) Expand 10 before | Expand all | Expand 10 after
1222 OnCancelDesktopNotification) 1220 OnCancelDesktopNotification)
1223 #if defined(OS_MACOSX) || defined(OS_ANDROID) 1221 #if defined(OS_MACOSX) || defined(OS_ANDROID)
1224 IPC_MESSAGE_HANDLER(ViewHostMsg_ShowPopup, OnShowPopup) 1222 IPC_MESSAGE_HANDLER(ViewHostMsg_ShowPopup, OnShowPopup)
1225 #endif 1223 #endif
1226 IPC_MESSAGE_HANDLER(ViewHostMsg_RunFileChooser, OnRunFileChooser) 1224 IPC_MESSAGE_HANDLER(ViewHostMsg_RunFileChooser, OnRunFileChooser)
1227 IPC_MESSAGE_HANDLER(ViewHostMsg_DidAccessInitialDocument, 1225 IPC_MESSAGE_HANDLER(ViewHostMsg_DidAccessInitialDocument,
1228 OnDidAccessInitialDocument) 1226 OnDidAccessInitialDocument)
1229 IPC_MESSAGE_HANDLER(ViewHostMsg_DomOperationResponse, 1227 IPC_MESSAGE_HANDLER(ViewHostMsg_DomOperationResponse,
1230 OnDomOperationResponse) 1228 OnDomOperationResponse)
1231 IPC_MESSAGE_HANDLER(AccessibilityHostMsg_Events, OnAccessibilityEvents) 1229 IPC_MESSAGE_HANDLER(AccessibilityHostMsg_Events, OnAccessibilityEvents)
1232 IPC_MESSAGE_HANDLER(ViewHostMsg_FocusedNodeTouched, OnFocusedNodeTouched)
1233 // Have the super handle all other messages. 1230 // Have the super handle all other messages.
1234 IPC_MESSAGE_UNHANDLED( 1231 IPC_MESSAGE_UNHANDLED(
1235 handled = RenderWidgetHostImpl::OnMessageReceived(msg)) 1232 handled = RenderWidgetHostImpl::OnMessageReceived(msg))
1236 IPC_END_MESSAGE_MAP_EX() 1233 IPC_END_MESSAGE_MAP_EX()
1237 1234
1238 if (!msg_is_ok) { 1235 if (!msg_is_ok) {
1239 // The message had a handler, but its de-serialization failed. 1236 // The message had a handler, but its de-serialization failed.
1240 // Kill the renderer. 1237 // Kill the renderer.
1241 RecordAction(UserMetricsAction("BadMessageTerminate_RVH")); 1238 RecordAction(UserMetricsAction("BadMessageTerminate_RVH"));
1242 GetProcess()->ReceivedBadMessage(); 1239 GetProcess()->ReceivedBadMessage();
(...skipping 951 matching lines...) Expand 10 before | Expand all | Expand 10 after
2194 2191
2195 void RenderViewHostImpl::OnDomOperationResponse( 2192 void RenderViewHostImpl::OnDomOperationResponse(
2196 const std::string& json_string, int automation_id) { 2193 const std::string& json_string, int automation_id) {
2197 DomOperationNotificationDetails details(json_string, automation_id); 2194 DomOperationNotificationDetails details(json_string, automation_id);
2198 NotificationService::current()->Notify( 2195 NotificationService::current()->Notify(
2199 NOTIFICATION_DOM_OPERATION_RESPONSE, 2196 NOTIFICATION_DOM_OPERATION_RESPONSE,
2200 Source<RenderViewHost>(this), 2197 Source<RenderViewHost>(this),
2201 Details<DomOperationNotificationDetails>(&details)); 2198 Details<DomOperationNotificationDetails>(&details));
2202 } 2199 }
2203 2200
2204 void RenderViewHostImpl::OnFocusedNodeTouched(bool editable) {
2205 #if defined(OS_WIN) && defined(USE_AURA)
2206 if (editable) {
2207 base::win::DisplayVirtualKeyboard();
2208 } else {
2209 base::win::DismissVirtualKeyboard();
2210 }
2211 #endif
2212 }
2213
2214 #if defined(OS_MACOSX) || defined(OS_ANDROID) 2201 #if defined(OS_MACOSX) || defined(OS_ANDROID)
2215 void RenderViewHostImpl::OnShowPopup( 2202 void RenderViewHostImpl::OnShowPopup(
2216 const ViewHostMsg_ShowPopup_Params& params) { 2203 const ViewHostMsg_ShowPopup_Params& params) {
2217 RenderViewHostDelegateView* view = delegate_->GetDelegateView(); 2204 RenderViewHostDelegateView* view = delegate_->GetDelegateView();
2218 if (view) { 2205 if (view) {
2219 view->ShowPopupMenu(params.bounds, 2206 view->ShowPopupMenu(params.bounds,
2220 params.item_height, 2207 params.item_height,
2221 params.item_font_size, 2208 params.item_font_size,
2222 params.selected_item, 2209 params.selected_item,
2223 params.popup_items, 2210 params.popup_items,
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
2262 void RenderViewHostImpl::AttachToFrameTree() { 2249 void RenderViewHostImpl::AttachToFrameTree() {
2263 FrameTree* frame_tree = delegate_->GetFrameTree(); 2250 FrameTree* frame_tree = delegate_->GetFrameTree();
2264 2251
2265 frame_tree->SwapMainFrame(main_render_frame_host_.get()); 2252 frame_tree->SwapMainFrame(main_render_frame_host_.get());
2266 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { 2253 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) {
2267 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); 2254 frame_tree->OnFirstNavigationAfterSwap(main_frame_id());
2268 } 2255 }
2269 } 2256 }
2270 2257
2271 } // namespace content 2258 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698