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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 bool WebContentsDelegate::EmbedsFullscreenWidget() const { | 139 bool WebContentsDelegate::EmbedsFullscreenWidget() const { |
140 return false; | 140 return false; |
141 } | 141 } |
142 | 142 |
143 bool WebContentsDelegate::IsFullscreenForTabOrPending( | 143 bool WebContentsDelegate::IsFullscreenForTabOrPending( |
144 const WebContents* web_contents) const { | 144 const WebContents* web_contents) const { |
145 return false; | 145 return false; |
146 } | 146 } |
147 | 147 |
148 content::ColorChooser* WebContentsDelegate::OpenColorChooser( | 148 content::ColorChooser* WebContentsDelegate::OpenColorChooser( |
149 WebContents* web_contents, SkColor color) { | 149 WebContents* web_contents, |
| 150 SkColor color, |
| 151 const std::vector<ColorSuggestion>& suggestions) { |
150 return NULL; | 152 return NULL; |
151 } | 153 } |
152 | 154 |
153 void WebContentsDelegate::RequestMediaAccessPermission( | 155 void WebContentsDelegate::RequestMediaAccessPermission( |
154 WebContents* web_contents, | 156 WebContents* web_contents, |
155 const MediaStreamRequest& request, | 157 const MediaStreamRequest& request, |
156 const MediaResponseCallback& callback) { | 158 const MediaResponseCallback& callback) { |
157 callback.Run(MediaStreamDevices(), scoped_ptr<MediaStreamUI>()); | 159 callback.Run(MediaStreamDevices(), scoped_ptr<MediaStreamUI>()); |
158 } | 160 } |
159 | 161 |
(...skipping 22 matching lines...) Expand all Loading... |
182 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); | 184 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); |
183 attached_contents_.erase(web_contents); | 185 attached_contents_.erase(web_contents); |
184 } | 186 } |
185 | 187 |
186 gfx::Size WebContentsDelegate::GetSizeForNewRenderView( | 188 gfx::Size WebContentsDelegate::GetSizeForNewRenderView( |
187 const WebContents* web_contents) const { | 189 const WebContents* web_contents) const { |
188 return gfx::Size(); | 190 return gfx::Size(); |
189 } | 191 } |
190 | 192 |
191 } // namespace content | 193 } // namespace content |
OLD | NEW |