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( |
| 134 const WebContents* tab) const { |
134 return false; | 135 return false; |
135 } | 136 } |
136 | 137 |
137 content::ColorChooser* WebContentsDelegate::OpenColorChooser(WebContents* tab, | 138 content::ColorChooser* WebContentsDelegate::OpenColorChooser(WebContents* tab, |
138 int color_chooser_id, | 139 int color_chooser_id, |
139 const SkColor& color) { | 140 const SkColor& color) { |
140 return NULL; | 141 return NULL; |
141 } | 142 } |
142 | 143 |
143 void WebContentsDelegate::WebIntentDispatch( | 144 void WebContentsDelegate::WebIntentDispatch( |
(...skipping 16 matching lines...) Expand all Loading... |
160 DCHECK(attached_contents_.find(web_contents) == attached_contents_.end()); | 161 DCHECK(attached_contents_.find(web_contents) == attached_contents_.end()); |
161 attached_contents_.insert(web_contents); | 162 attached_contents_.insert(web_contents); |
162 } | 163 } |
163 | 164 |
164 void WebContentsDelegate::Detach(WebContents* web_contents) { | 165 void WebContentsDelegate::Detach(WebContents* web_contents) { |
165 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); | 166 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); |
166 attached_contents_.erase(web_contents); | 167 attached_contents_.erase(web_contents); |
167 } | 168 } |
168 | 169 |
169 } // namespace content | 170 } // namespace content |
OLD | NEW |