| 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 3980 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3991 #elif defined(OS_MACOSX) | 3991 #elif defined(OS_MACOSX) |
| 3992 | 3992 |
| 3993 void WebContentsImpl::SetAllowOverlappingViews(bool overlapping) { | 3993 void WebContentsImpl::SetAllowOverlappingViews(bool overlapping) { |
| 3994 view_->SetAllowOverlappingViews(overlapping); | 3994 view_->SetAllowOverlappingViews(overlapping); |
| 3995 } | 3995 } |
| 3996 | 3996 |
| 3997 bool WebContentsImpl::GetAllowOverlappingViews() { | 3997 bool WebContentsImpl::GetAllowOverlappingViews() { |
| 3998 return view_->GetAllowOverlappingViews(); | 3998 return view_->GetAllowOverlappingViews(); |
| 3999 } | 3999 } |
| 4000 | 4000 |
| 4001 void WebContentsImpl::SetOverlayView(WebContents* overlay, | 4001 void WebContentsImpl::SetAllowOtherViews(bool allow) { |
| 4002 const gfx::Point& offset) { | 4002 view_->SetAllowOtherViews(allow); |
| 4003 view_->SetOverlayView(static_cast<WebContentsImpl*>(overlay)->GetView(), | |
| 4004 offset); | |
| 4005 } | 4003 } |
| 4006 | 4004 |
| 4007 void WebContentsImpl::RemoveOverlayView() { | 4005 bool WebContentsImpl::GetAllowOtherViews() { |
| 4008 view_->RemoveOverlayView(); | 4006 return view_->GetAllowOtherViews(); |
| 4009 } | 4007 } |
| 4010 | 4008 |
| 4011 #endif | 4009 #endif |
| 4012 | 4010 |
| 4013 void WebContentsImpl::OnDialogClosed(int render_process_id, | 4011 void WebContentsImpl::OnDialogClosed(int render_process_id, |
| 4014 int render_frame_id, | 4012 int render_frame_id, |
| 4015 IPC::Message* reply_msg, | 4013 IPC::Message* reply_msg, |
| 4016 bool dialog_was_suppressed, | 4014 bool dialog_was_suppressed, |
| 4017 bool success, | 4015 bool success, |
| 4018 const base::string16& user_input) { | 4016 const base::string16& user_input) { |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4116 if (new_size != old_size) | 4114 if (new_size != old_size) |
| 4117 delegate_->UpdatePreferredSize(this, new_size); | 4115 delegate_->UpdatePreferredSize(this, new_size); |
| 4118 } | 4116 } |
| 4119 | 4117 |
| 4120 void WebContentsImpl::ResumeResponseDeferredAtStart() { | 4118 void WebContentsImpl::ResumeResponseDeferredAtStart() { |
| 4121 FrameTreeNode* node = frame_tree_.root(); | 4119 FrameTreeNode* node = frame_tree_.root(); |
| 4122 node->render_manager()->ResumeResponseDeferredAtStart(); | 4120 node->render_manager()->ResumeResponseDeferredAtStart(); |
| 4123 } | 4121 } |
| 4124 | 4122 |
| 4125 } // namespace content | 4123 } // namespace content |
| OLD | NEW |