OLD | NEW |
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/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
684 } | 684 } |
685 | 685 |
686 void WebContentsImpl::AddAccessibilityMode(AccessibilityMode mode) { | 686 void WebContentsImpl::AddAccessibilityMode(AccessibilityMode mode) { |
687 SetAccessibilityMode(AddAccessibilityModeTo(accessibility_mode_, mode)); | 687 SetAccessibilityMode(AddAccessibilityModeTo(accessibility_mode_, mode)); |
688 } | 688 } |
689 | 689 |
690 void WebContentsImpl::RemoveAccessibilityMode(AccessibilityMode mode) { | 690 void WebContentsImpl::RemoveAccessibilityMode(AccessibilityMode mode) { |
691 SetAccessibilityMode(RemoveAccessibilityModeFrom(accessibility_mode_, mode)); | 691 SetAccessibilityMode(RemoveAccessibilityModeFrom(accessibility_mode_, mode)); |
692 } | 692 } |
693 | 693 |
| 694 void WebContentsImpl::ClearNavigationTransitionData() { |
| 695 FrameTreeNode* node = frame_tree_.root(); |
| 696 node->render_manager()->ClearNavigationTransitionData(); |
| 697 } |
| 698 |
694 WebUI* WebContentsImpl::CreateWebUI(const GURL& url) { | 699 WebUI* WebContentsImpl::CreateWebUI(const GURL& url) { |
695 WebUIImpl* web_ui = new WebUIImpl(this); | 700 WebUIImpl* web_ui = new WebUIImpl(this); |
696 WebUIController* controller = WebUIControllerFactoryRegistry::GetInstance()-> | 701 WebUIController* controller = WebUIControllerFactoryRegistry::GetInstance()-> |
697 CreateWebUIControllerForURL(web_ui, url); | 702 CreateWebUIControllerForURL(web_ui, url); |
698 if (controller) { | 703 if (controller) { |
699 web_ui->AddMessageHandler(new GenericHandler()); | 704 web_ui->AddMessageHandler(new GenericHandler()); |
700 web_ui->SetController(controller); | 705 web_ui->SetController(controller); |
701 return web_ui; | 706 return web_ui; |
702 } | 707 } |
703 | 708 |
(...skipping 3621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4325 node->render_manager()->ResumeResponseDeferredAtStart(); | 4330 node->render_manager()->ResumeResponseDeferredAtStart(); |
4326 } | 4331 } |
4327 | 4332 |
4328 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4333 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
4329 force_disable_overscroll_content_ = force_disable; | 4334 force_disable_overscroll_content_ = force_disable; |
4330 if (view_) | 4335 if (view_) |
4331 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4336 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
4332 } | 4337 } |
4333 | 4338 |
4334 } // namespace content | 4339 } // namespace content |
OLD | NEW |