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

Side by Side Diff: chrome/browser/browser_accessibility_manager.cc

Issue 21039: Revert my change to get the tree green. Not sure why the tests became flaky.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "chrome/browser/browser_accessibility_manager.h" 5 #include "chrome/browser/browser_accessibility_manager.h"
6 6
7 #include "chrome/browser/browser_accessibility.h" 7 #include "chrome/browser/browser_accessibility.h"
8 #include "chrome/browser/renderer_host/render_process_host.h" 8 #include "chrome/browser/renderer_host/render_process_host.h"
9 #include "chrome/browser/renderer_host/render_widget_host.h" 9 #include "chrome/browser/renderer_host/render_widget_host.h"
10 #include "chrome/common/notification_service.h" 10 #include "chrome/common/notification_service.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 routing_id(), in_params, &out_params_); 109 routing_id(), in_params, &out_params_);
110 // Necessary for the send to keep the UI responsive. 110 // Necessary for the send to keep the UI responsive.
111 msg->EnableMessagePumping(); 111 msg->EnableMessagePumping();
112 success = members->render_widget_host_->process()->channel()-> 112 success = members->render_widget_host_->process()->channel()->
113 SendWithTimeout(msg, kAccessibilityMessageTimeOut); 113 SendWithTimeout(msg, kAccessibilityMessageTimeOut);
114 } 114 }
115 115
116 return success; 116 return success;
117 } 117 }
118 118
119 const ViewHostMsg_Accessibility_Out_Params& 119 ViewHostMsg_Accessibility_Out_Params BrowserAccessibilityManager::response() {
120 BrowserAccessibilityManager::response() {
121 return out_params_; 120 return out_params_;
122 } 121 }
123 122
124 HWND BrowserAccessibilityManager::parent_hwnd(int id) { 123 HWND BrowserAccessibilityManager::parent_hwnd(int id) {
125 // Retrieve the parent HWND connected to the requester's id. 124 // Retrieve the parent HWND connected to the requester's id.
126 InstanceMap::iterator it = instance_map_.find(id); 125 InstanceMap::iterator it = instance_map_.find(id);
127 126
128 if (it == instance_map_.end()) { 127 if (it == instance_map_.end()) {
129 // Id not found. 128 // Id not found.
130 return NULL; 129 return NULL;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 165
167 // Delete entry also from InstanceMap. 166 // Delete entry also from InstanceMap.
168 InstanceMap::iterator it2 = instance_map_.find(it->second->instance_id()); 167 InstanceMap::iterator it2 = instance_map_.find(it->second->instance_id());
169 168
170 if (it2 != instance_map_.end()) 169 if (it2 != instance_map_.end())
171 instance_map_.erase(it2); 170 instance_map_.erase(it2);
172 171
173 // Only delete the first entry once it is no longer in use. 172 // Only delete the first entry once it is no longer in use.
174 render_process_host_map_.erase(it); 173 render_process_host_map_.erase(it);
175 } 174 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_accessibility_manager.h ('k') | chrome/browser/printing/print_view_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698