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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 651593002: Remove RendererAccessibilityFocusOnly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 6 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "content/public/common/url_constants.h" 48 #include "content/public/common/url_constants.h"
49 #include "content/public/common/url_utils.h" 49 #include "content/public/common/url_utils.h"
50 #include "content/public/renderer/browser_plugin_delegate.h" 50 #include "content/public/renderer/browser_plugin_delegate.h"
51 #include "content/public/renderer/content_renderer_client.h" 51 #include "content/public/renderer/content_renderer_client.h"
52 #include "content/public/renderer/context_menu_client.h" 52 #include "content/public/renderer/context_menu_client.h"
53 #include "content/public/renderer/document_state.h" 53 #include "content/public/renderer/document_state.h"
54 #include "content/public/renderer/navigation_state.h" 54 #include "content/public/renderer/navigation_state.h"
55 #include "content/public/renderer/render_frame_observer.h" 55 #include "content/public/renderer/render_frame_observer.h"
56 #include "content/renderer/accessibility/renderer_accessibility.h" 56 #include "content/renderer/accessibility/renderer_accessibility.h"
57 #include "content/renderer/accessibility/renderer_accessibility_complete.h" 57 #include "content/renderer/accessibility/renderer_accessibility_complete.h"
58 #include "content/renderer/accessibility/renderer_accessibility_focus_only.h"
59 #include "content/renderer/browser_plugin/browser_plugin.h" 58 #include "content/renderer/browser_plugin/browser_plugin.h"
60 #include "content/renderer/browser_plugin/browser_plugin_manager.h" 59 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
61 #include "content/renderer/child_frame_compositing_helper.h" 60 #include "content/renderer/child_frame_compositing_helper.h"
62 #include "content/renderer/context_menu_params_builder.h" 61 #include "content/renderer/context_menu_params_builder.h"
63 #include "content/renderer/devtools/devtools_agent.h" 62 #include "content/renderer/devtools/devtools_agent.h"
64 #include "content/renderer/dom_automation_controller.h" 63 #include "content/renderer/dom_automation_controller.h"
65 #include "content/renderer/dom_utils.h" 64 #include "content/renderer/dom_utils.h"
66 #include "content/renderer/external_popup_menu.h" 65 #include "content/renderer/external_popup_menu.h"
67 #include "content/renderer/geolocation_dispatcher.h" 66 #include "content/renderer/geolocation_dispatcher.h"
68 #include "content/renderer/history_controller.h" 67 #include "content/renderer/history_controller.h"
(...skipping 1253 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 accessibility_mode_ = new_mode; 1321 accessibility_mode_ = new_mode;
1323 if (renderer_accessibility_) { 1322 if (renderer_accessibility_) {
1324 delete renderer_accessibility_; 1323 delete renderer_accessibility_;
1325 renderer_accessibility_ = NULL; 1324 renderer_accessibility_ = NULL;
1326 } 1325 }
1327 if (accessibility_mode_ == AccessibilityModeOff) 1326 if (accessibility_mode_ == AccessibilityModeOff)
1328 return; 1327 return;
1329 1328
1330 if (accessibility_mode_ & AccessibilityModeFlagFullTree) 1329 if (accessibility_mode_ & AccessibilityModeFlagFullTree)
1331 renderer_accessibility_ = new RendererAccessibilityComplete(this); 1330 renderer_accessibility_ = new RendererAccessibilityComplete(this);
1332 #if !defined(OS_ANDROID)
1333 else
1334 renderer_accessibility_ = new RendererAccessibilityFocusOnly(this);
1335 #endif
1336 } 1331 }
1337 1332
1338 void RenderFrameImpl::OnDisownOpener() { 1333 void RenderFrameImpl::OnDisownOpener() {
1339 // TODO(creis): We should only see this for main frames for now. To support 1334 // TODO(creis): We should only see this for main frames for now. To support
1340 // disowning the opener on subframes, we will need to move WebContentsImpl's 1335 // disowning the opener on subframes, we will need to move WebContentsImpl's
1341 // opener_ to FrameTreeNode. 1336 // opener_ to FrameTreeNode.
1342 CHECK(!frame_->parent()); 1337 CHECK(!frame_->parent());
1343 1338
1344 if (frame_->opener()) 1339 if (frame_->opener())
1345 frame_->setOpener(NULL); 1340 frame_->setOpener(NULL);
(...skipping 2628 matching lines...) Expand 10 before | Expand all | Expand 10 after
3974 3969
3975 #if defined(ENABLE_BROWSER_CDMS) 3970 #if defined(ENABLE_BROWSER_CDMS)
3976 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3971 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3977 if (!cdm_manager_) 3972 if (!cdm_manager_)
3978 cdm_manager_ = new RendererCdmManager(this); 3973 cdm_manager_ = new RendererCdmManager(this);
3979 return cdm_manager_; 3974 return cdm_manager_;
3980 } 3975 }
3981 #endif // defined(ENABLE_BROWSER_CDMS) 3976 #endif // defined(ENABLE_BROWSER_CDMS)
3982 3977
3983 } // namespace content 3978 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698