| 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 3961 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3972 #elif defined(OS_MACOSX) | 3972 #elif defined(OS_MACOSX) |
| 3973 | 3973 |
| 3974 void WebContentsImpl::SetAllowOverlappingViews(bool overlapping) { | 3974 void WebContentsImpl::SetAllowOverlappingViews(bool overlapping) { |
| 3975 view_->SetAllowOverlappingViews(overlapping); | 3975 view_->SetAllowOverlappingViews(overlapping); |
| 3976 } | 3976 } |
| 3977 | 3977 |
| 3978 bool WebContentsImpl::GetAllowOverlappingViews() { | 3978 bool WebContentsImpl::GetAllowOverlappingViews() { |
| 3979 return view_->GetAllowOverlappingViews(); | 3979 return view_->GetAllowOverlappingViews(); |
| 3980 } | 3980 } |
| 3981 | 3981 |
| 3982 void WebContentsImpl::SetOverlayView(WebContents* overlay, | 3982 void WebContentsImpl::SetAllowOtherViews(bool allow) { |
| 3983 const gfx::Point& offset) { | 3983 view_->SetAllowOtherViews(allow); |
| 3984 view_->SetOverlayView(static_cast<WebContentsImpl*>(overlay)->GetView(), | |
| 3985 offset); | |
| 3986 } | 3984 } |
| 3987 | 3985 |
| 3988 void WebContentsImpl::RemoveOverlayView() { | 3986 bool WebContentsImpl::GetAllowOtherViews() { |
| 3989 view_->RemoveOverlayView(); | 3987 return view_->GetAllowOtherViews(); |
| 3990 } | 3988 } |
| 3991 | 3989 |
| 3992 #endif | 3990 #endif |
| 3993 | 3991 |
| 3994 void WebContentsImpl::OnDialogClosed(int render_process_id, | 3992 void WebContentsImpl::OnDialogClosed(int render_process_id, |
| 3995 int render_frame_id, | 3993 int render_frame_id, |
| 3996 IPC::Message* reply_msg, | 3994 IPC::Message* reply_msg, |
| 3997 bool dialog_was_suppressed, | 3995 bool dialog_was_suppressed, |
| 3998 bool success, | 3996 bool success, |
| 3999 const base::string16& user_input) { | 3997 const base::string16& user_input) { |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4097 if (new_size != old_size) | 4095 if (new_size != old_size) |
| 4098 delegate_->UpdatePreferredSize(this, new_size); | 4096 delegate_->UpdatePreferredSize(this, new_size); |
| 4099 } | 4097 } |
| 4100 | 4098 |
| 4101 void WebContentsImpl::ResumeResponseDeferredAtStart() { | 4099 void WebContentsImpl::ResumeResponseDeferredAtStart() { |
| 4102 FrameTreeNode* node = frame_tree_.root(); | 4100 FrameTreeNode* node = frame_tree_.root(); |
| 4103 node->render_manager()->ResumeResponseDeferredAtStart(); | 4101 node->render_manager()->ResumeResponseDeferredAtStart(); |
| 4104 } | 4102 } |
| 4105 | 4103 |
| 4106 } // namespace content | 4104 } // namespace content |
| OLD | NEW |