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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 | 114 |
115 bool WebContentsDelegate::OnGoToEntryOffset(int offset) { | 115 bool WebContentsDelegate::OnGoToEntryOffset(int offset) { |
116 return true; | 116 return true; |
117 } | 117 } |
118 | 118 |
119 bool WebContentsDelegate::ShouldCreateWebContents( | 119 bool WebContentsDelegate::ShouldCreateWebContents( |
120 WebContents* web_contents, | 120 WebContents* web_contents, |
121 int route_id, | 121 int route_id, |
122 WindowContainerType window_container_type, | 122 WindowContainerType window_container_type, |
123 const string16& frame_name, | 123 const string16& frame_name, |
124 const GURL& target_url) { | 124 const GURL& target_url, |
| 125 const WebKit::WindowFeatures& web_window_features) { |
125 return true; | 126 return true; |
126 } | 127 } |
127 | 128 |
128 JavaScriptDialogManager* WebContentsDelegate::GetJavaScriptDialogManager() { | 129 JavaScriptDialogManager* WebContentsDelegate::GetJavaScriptDialogManager() { |
129 return NULL; | 130 return NULL; |
130 } | 131 } |
131 | 132 |
132 bool WebContentsDelegate::IsFullscreenForTabOrPending( | 133 bool WebContentsDelegate::IsFullscreenForTabOrPending( |
133 const WebContents* web_contents) const { | 134 const WebContents* web_contents) const { |
134 return false; | 135 return false; |
(...skipping 26 matching lines...) Expand all Loading... |
161 DCHECK(attached_contents_.find(web_contents) == attached_contents_.end()); | 162 DCHECK(attached_contents_.find(web_contents) == attached_contents_.end()); |
162 attached_contents_.insert(web_contents); | 163 attached_contents_.insert(web_contents); |
163 } | 164 } |
164 | 165 |
165 void WebContentsDelegate::Detach(WebContents* web_contents) { | 166 void WebContentsDelegate::Detach(WebContents* web_contents) { |
166 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); | 167 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); |
167 attached_contents_.erase(web_contents); | 168 attached_contents_.erase(web_contents); |
168 } | 169 } |
169 | 170 |
170 } // namespace content | 171 } // namespace content |
OLD | NEW |