OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/shell/shell_content_browser_client.h" | 5 #include "content/shell/shell_content_browser_client.h" |
6 | 6 |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "content/browser/webui/empty_web_ui_factory.h" | 8 #include "content/browser/webui/empty_web_ui_factory.h" |
9 #include "content/shell/shell.h" | 9 #include "content/shell/shell.h" |
10 #include "content/shell/shell_browser_main.h" | 10 #include "content/shell/shell_browser_main.h" |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 | 191 |
192 void ShellContentBrowserClient::RequestDesktopNotificationPermission( | 192 void ShellContentBrowserClient::RequestDesktopNotificationPermission( |
193 const GURL& source_origin, | 193 const GURL& source_origin, |
194 int callback_context, | 194 int callback_context, |
195 int render_process_id, | 195 int render_process_id, |
196 int render_view_id) { | 196 int render_view_id) { |
197 } | 197 } |
198 | 198 |
199 WebKit::WebNotificationPresenter::Permission | 199 WebKit::WebNotificationPresenter::Permission |
200 ShellContentBrowserClient::CheckDesktopNotificationPermission( | 200 ShellContentBrowserClient::CheckDesktopNotificationPermission( |
201 const GURL& source_url, | 201 const GURL& source_origin, |
202 const content::ResourceContext& context) { | 202 const content::ResourceContext& context, |
| 203 int render_process_id) { |
203 return WebKit::WebNotificationPresenter::PermissionAllowed; | 204 return WebKit::WebNotificationPresenter::PermissionAllowed; |
204 } | 205 } |
205 | 206 |
206 void ShellContentBrowserClient::ShowDesktopNotification( | 207 void ShellContentBrowserClient::ShowDesktopNotification( |
207 const DesktopNotificationHostMsg_Show_Params& params, | 208 const DesktopNotificationHostMsg_Show_Params& params, |
208 int render_process_id, | 209 int render_process_id, |
209 int render_view_id, | 210 int render_view_id, |
210 bool worker) { | 211 bool worker) { |
211 } | 212 } |
212 | 213 |
213 void ShellContentBrowserClient::CancelDesktopNotification( | 214 void ShellContentBrowserClient::CancelDesktopNotification( |
214 int render_process_id, | 215 int render_process_id, |
215 int render_view_id, | 216 int render_view_id, |
216 int notification_id) { | 217 int notification_id) { |
217 } | 218 } |
218 | 219 |
219 bool ShellContentBrowserClient::CanCreateWindow( | 220 bool ShellContentBrowserClient::CanCreateWindow( |
220 const GURL& source_url, | 221 const GURL& origin, |
221 WindowContainerType container_type, | 222 WindowContainerType container_type, |
222 const content::ResourceContext& context) { | 223 const content::ResourceContext& context, |
| 224 int render_process_id) { |
223 return true; | 225 return true; |
224 } | 226 } |
225 | 227 |
226 std::string ShellContentBrowserClient::GetWorkerProcessTitle( | 228 std::string ShellContentBrowserClient::GetWorkerProcessTitle( |
227 const GURL& url, const content::ResourceContext& context) { | 229 const GURL& url, const content::ResourceContext& context) { |
228 return std::string(); | 230 return std::string(); |
229 } | 231 } |
230 | 232 |
231 ResourceDispatcherHost* ShellContentBrowserClient::GetResourceDispatcherHost() { | 233 ResourceDispatcherHost* ShellContentBrowserClient::GetResourceDispatcherHost() { |
232 return shell_browser_main_parts_->GetResourceDispatcherHost(); | 234 return shell_browser_main_parts_->GetResourceDispatcherHost(); |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 tab_contents_view->tab_contents()->browser_context(), | 321 tab_contents_view->tab_contents()->browser_context(), |
320 GURL(), | 322 GURL(), |
321 tab_contents_view->tab_contents()->GetSiteInstance(), | 323 tab_contents_view->tab_contents()->GetSiteInstance(), |
322 route_id, | 324 route_id, |
323 tab_contents_view->tab_contents()); | 325 tab_contents_view->tab_contents()); |
324 return shell->tab_contents(); | 326 return shell->tab_contents(); |
325 } | 327 } |
326 #endif | 328 #endif |
327 | 329 |
328 } // namespace content | 330 } // namespace content |
OLD | NEW |