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

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: Revert patch set #4 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "content/public/common/page_state.h" 46 #include "content/public/common/page_state.h"
47 #include "content/public/common/resource_response.h" 47 #include "content/public/common/resource_response.h"
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"
57 #include "content/renderer/accessibility/renderer_accessibility_complete.h" 56 #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" 57 #include "content/renderer/browser_plugin/browser_plugin.h"
60 #include "content/renderer/browser_plugin/browser_plugin_manager.h" 58 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
61 #include "content/renderer/child_frame_compositing_helper.h" 59 #include "content/renderer/child_frame_compositing_helper.h"
62 #include "content/renderer/context_menu_params_builder.h" 60 #include "content/renderer/context_menu_params_builder.h"
63 #include "content/renderer/devtools/devtools_agent.h" 61 #include "content/renderer/devtools/devtools_agent.h"
64 #include "content/renderer/dom_automation_controller.h" 62 #include "content/renderer/dom_automation_controller.h"
65 #include "content/renderer/dom_utils.h" 63 #include "content/renderer/dom_utils.h"
66 #include "content/renderer/external_popup_menu.h" 64 #include "content/renderer/external_popup_menu.h"
67 #include "content/renderer/geolocation_dispatcher.h" 65 #include "content/renderer/geolocation_dispatcher.h"
68 #include "content/renderer/history_controller.h" 66 #include "content/renderer/history_controller.h"
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1360 accessibility_mode_ = new_mode; 1358 accessibility_mode_ = new_mode;
1361 if (renderer_accessibility_) { 1359 if (renderer_accessibility_) {
1362 delete renderer_accessibility_; 1360 delete renderer_accessibility_;
1363 renderer_accessibility_ = NULL; 1361 renderer_accessibility_ = NULL;
1364 } 1362 }
1365 if (accessibility_mode_ == AccessibilityModeOff) 1363 if (accessibility_mode_ == AccessibilityModeOff)
1366 return; 1364 return;
1367 1365
1368 if (accessibility_mode_ & AccessibilityModeFlagFullTree) 1366 if (accessibility_mode_ & AccessibilityModeFlagFullTree)
1369 renderer_accessibility_ = new RendererAccessibilityComplete(this); 1367 renderer_accessibility_ = new RendererAccessibilityComplete(this);
1370 #if !defined(OS_ANDROID)
1371 else
1372 renderer_accessibility_ = new RendererAccessibilityFocusOnly(this);
1373 #endif
1374 } 1368 }
1375 1369
1376 void RenderFrameImpl::OnDisownOpener() { 1370 void RenderFrameImpl::OnDisownOpener() {
1377 // TODO(creis): We should only see this for main frames for now. To support 1371 // TODO(creis): We should only see this for main frames for now. To support
1378 // disowning the opener on subframes, we will need to move WebContentsImpl's 1372 // disowning the opener on subframes, we will need to move WebContentsImpl's
1379 // opener_ to FrameTreeNode. 1373 // opener_ to FrameTreeNode.
1380 CHECK(!frame_->parent()); 1374 CHECK(!frame_->parent());
1381 1375
1382 if (frame_->opener()) 1376 if (frame_->opener())
1383 frame_->setOpener(NULL); 1377 frame_->setOpener(NULL);
(...skipping 2689 matching lines...) Expand 10 before | Expand all | Expand 10 after
4073 4067
4074 #if defined(ENABLE_BROWSER_CDMS) 4068 #if defined(ENABLE_BROWSER_CDMS)
4075 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4069 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4076 if (!cdm_manager_) 4070 if (!cdm_manager_)
4077 cdm_manager_ = new RendererCdmManager(this); 4071 cdm_manager_ = new RendererCdmManager(this);
4078 return cdm_manager_; 4072 return cdm_manager_;
4079 } 4073 }
4080 #endif // defined(ENABLE_BROWSER_CDMS) 4074 #endif // defined(ENABLE_BROWSER_CDMS)
4081 4075
4082 } // namespace content 4076 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/accessibility/renderer_accessibility_focus_only.cc ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698