| 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/public/browser/web_contents_delegate.h" | 5 #include "content/public/browser/web_contents_delegate.h" |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/singleton.h" | 9 #include "base/memory/singleton.h" |
| 10 #include "content/public/browser/render_view_host.h" | 10 #include "content/public/browser/render_view_host.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 int route_id, | 123 int route_id, |
| 124 WindowContainerType window_container_type, | 124 WindowContainerType window_container_type, |
| 125 const string16& frame_name) { | 125 const string16& frame_name) { |
| 126 return true; | 126 return true; |
| 127 } | 127 } |
| 128 | 128 |
| 129 JavaScriptDialogCreator* WebContentsDelegate::GetJavaScriptDialogCreator() { | 129 JavaScriptDialogCreator* WebContentsDelegate::GetJavaScriptDialogCreator() { |
| 130 return NULL; | 130 return NULL; |
| 131 } | 131 } |
| 132 | 132 |
| 133 bool WebContentsDelegate::IsFullscreenForTab(const WebContents* tab) const { | 133 bool WebContentsDelegate::IsFullscreenForTabOrPending(const WebContents* tab) |
| 134 const { |
| 134 return false; | 135 return false; |
| 135 } | 136 } |
| 136 | 137 |
| 137 void WebContentsDelegate::WebIntentDispatch( | 138 void WebContentsDelegate::WebIntentDispatch( |
| 138 WebContents* tab, | 139 WebContents* tab, |
| 139 WebIntentsDispatcher* intents_dispatcher) { | 140 WebIntentsDispatcher* intents_dispatcher) { |
| 140 // The caller passes this method ownership of the |intents_dispatcher|, but | 141 // The caller passes this method ownership of the |intents_dispatcher|, but |
| 141 // this empty implementation will not use it, so we delete it immediately. | 142 // this empty implementation will not use it, so we delete it immediately. |
| 142 delete intents_dispatcher; | 143 delete intents_dispatcher; |
| 143 } | 144 } |
| (...skipping 10 matching lines...) Expand all Loading... |
| 154 DCHECK(attached_contents_.find(web_contents) == attached_contents_.end()); | 155 DCHECK(attached_contents_.find(web_contents) == attached_contents_.end()); |
| 155 attached_contents_.insert(web_contents); | 156 attached_contents_.insert(web_contents); |
| 156 } | 157 } |
| 157 | 158 |
| 158 void WebContentsDelegate::Detach(WebContents* web_contents) { | 159 void WebContentsDelegate::Detach(WebContents* web_contents) { |
| 159 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); | 160 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); |
| 160 attached_contents_.erase(web_contents); | 161 attached_contents_.erase(web_contents); |
| 161 } | 162 } |
| 162 | 163 |
| 163 } // namespace content | 164 } // namespace content |
| OLD | NEW |