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

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

Issue 688173002: Refactor RendererAccessibiltiyComplete back into RendererAccessibility. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "content/public/common/page_state.h" 45 #include "content/public/common/page_state.h"
46 #include "content/public/common/resource_response.h" 46 #include "content/public/common/resource_response.h"
47 #include "content/public/common/url_constants.h" 47 #include "content/public/common/url_constants.h"
48 #include "content/public/common/url_utils.h" 48 #include "content/public/common/url_utils.h"
49 #include "content/public/renderer/browser_plugin_delegate.h" 49 #include "content/public/renderer/browser_plugin_delegate.h"
50 #include "content/public/renderer/content_renderer_client.h" 50 #include "content/public/renderer/content_renderer_client.h"
51 #include "content/public/renderer/context_menu_client.h" 51 #include "content/public/renderer/context_menu_client.h"
52 #include "content/public/renderer/document_state.h" 52 #include "content/public/renderer/document_state.h"
53 #include "content/public/renderer/navigation_state.h" 53 #include "content/public/renderer/navigation_state.h"
54 #include "content/public/renderer/render_frame_observer.h" 54 #include "content/public/renderer/render_frame_observer.h"
55 #include "content/renderer/accessibility/renderer_accessibility_complete.h" 55 #include "content/renderer/accessibility/renderer_accessibility.h"
56 #include "content/renderer/browser_plugin/browser_plugin.h" 56 #include "content/renderer/browser_plugin/browser_plugin.h"
57 #include "content/renderer/browser_plugin/browser_plugin_manager.h" 57 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
58 #include "content/renderer/child_frame_compositing_helper.h" 58 #include "content/renderer/child_frame_compositing_helper.h"
59 #include "content/renderer/context_menu_params_builder.h" 59 #include "content/renderer/context_menu_params_builder.h"
60 #include "content/renderer/devtools/devtools_agent.h" 60 #include "content/renderer/devtools/devtools_agent.h"
61 #include "content/renderer/dom_automation_controller.h" 61 #include "content/renderer/dom_automation_controller.h"
62 #include "content/renderer/dom_utils.h" 62 #include "content/renderer/dom_utils.h"
63 #include "content/renderer/external_popup_menu.h" 63 #include "content/renderer/external_popup_menu.h"
64 #include "content/renderer/geolocation_dispatcher.h" 64 #include "content/renderer/geolocation_dispatcher.h"
65 #include "content/renderer/history_controller.h" 65 #include "content/renderer/history_controller.h"
(...skipping 1299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1365 // an accessibility mode change but the frame is persisting. 1365 // an accessibility mode change but the frame is persisting.
1366 renderer_accessibility_->DisableAccessibility(); 1366 renderer_accessibility_->DisableAccessibility();
1367 1367
1368 delete renderer_accessibility_; 1368 delete renderer_accessibility_;
1369 renderer_accessibility_ = NULL; 1369 renderer_accessibility_ = NULL;
1370 } 1370 }
1371 if (accessibility_mode_ == AccessibilityModeOff) 1371 if (accessibility_mode_ == AccessibilityModeOff)
1372 return; 1372 return;
1373 1373
1374 if (accessibility_mode_ & AccessibilityModeFlagFullTree) 1374 if (accessibility_mode_ & AccessibilityModeFlagFullTree)
1375 renderer_accessibility_ = new RendererAccessibilityComplete(this); 1375 renderer_accessibility_ = new RendererAccessibility(this);
1376 } 1376 }
1377 1377
1378 void RenderFrameImpl::OnDisownOpener() { 1378 void RenderFrameImpl::OnDisownOpener() {
1379 // TODO(creis): We should only see this for main frames for now. To support 1379 // TODO(creis): We should only see this for main frames for now. To support
1380 // disowning the opener on subframes, we will need to move WebContentsImpl's 1380 // disowning the opener on subframes, we will need to move WebContentsImpl's
1381 // opener_ to FrameTreeNode. 1381 // opener_ to FrameTreeNode.
1382 CHECK(!frame_->parent()); 1382 CHECK(!frame_->parent());
1383 1383
1384 if (frame_->opener()) 1384 if (frame_->opener())
1385 frame_->setOpener(NULL); 1385 frame_->setOpener(NULL);
(...skipping 2729 matching lines...) Expand 10 before | Expand all | Expand 10 after
4115 4115
4116 #if defined(ENABLE_BROWSER_CDMS) 4116 #if defined(ENABLE_BROWSER_CDMS)
4117 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4117 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4118 if (!cdm_manager_) 4118 if (!cdm_manager_)
4119 cdm_manager_ = new RendererCdmManager(this); 4119 cdm_manager_ = new RendererCdmManager(this);
4120 return cdm_manager_; 4120 return cdm_manager_;
4121 } 4121 }
4122 #endif // defined(ENABLE_BROWSER_CDMS) 4122 #endif // defined(ENABLE_BROWSER_CDMS)
4123 4123
4124 } // namespace content 4124 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698