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 "chrome/browser/tab_contents/background_contents.h" | 5 #include "chrome/browser/tab_contents/background_contents.h" |
6 | 6 |
7 #include "chrome/browser/background_contents_service.h" | 7 #include "chrome/browser/background_contents_service.h" |
8 #include "chrome/browser/desktop_notification_handler.h" | 8 #include "chrome/browser/desktop_notification_handler.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/renderer_preferences_util.h" | 10 #include "chrome/browser/renderer_preferences_util.h" |
| 11 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h" |
11 #include "chrome/common/extensions/extension_constants.h" | 12 #include "chrome/common/extensions/extension_constants.h" |
12 #include "chrome/common/extensions/extension_messages.h" | 13 #include "chrome/common/extensions/extension_messages.h" |
13 #include "chrome/common/url_constants.h" | 14 #include "chrome/common/url_constants.h" |
14 #include "chrome/common/view_types.h" | 15 #include "chrome/common/view_types.h" |
15 #include "content/browser/browsing_instance.h" | 16 #include "content/browser/browsing_instance.h" |
16 #include "content/browser/renderer_host/render_view_host.h" | 17 #include "content/browser/renderer_host/render_view_host.h" |
17 #include "content/browser/site_instance.h" | 18 #include "content/browser/site_instance.h" |
18 #include "content/common/notification_service.h" | 19 #include "content/common/notification_service.h" |
19 #include "content/common/view_messages.h" | 20 #include "content/common/view_messages.h" |
20 #include "ui/gfx/rect.h" | 21 #include "ui/gfx/rect.h" |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 render_view_host_->BlockExtensionRequest(params.request_id); | 218 render_view_host_->BlockExtensionRequest(params.request_id); |
218 } | 219 } |
219 | 220 |
220 void BackgroundContents::CreateNewWindow( | 221 void BackgroundContents::CreateNewWindow( |
221 int route_id, | 222 int route_id, |
222 const ViewHostMsg_CreateWindow_Params& params) { | 223 const ViewHostMsg_CreateWindow_Params& params) { |
223 delegate_view_helper_.CreateNewWindow( | 224 delegate_view_helper_.CreateNewWindow( |
224 route_id, | 225 route_id, |
225 render_view_host_->process()->profile(), | 226 render_view_host_->process()->profile(), |
226 render_view_host_->site_instance(), | 227 render_view_host_->site_instance(), |
227 WebUIFactory::GetWebUIType(render_view_host_->process()->profile(), url_), | 228 ChromeWebUIFactory::GetInstance()->GetWebUIType( |
| 229 render_view_host_->process()->profile(), url_), |
228 this, | 230 this, |
229 params.window_container_type, | 231 params.window_container_type, |
230 params.frame_name); | 232 params.frame_name); |
231 } | 233 } |
232 | 234 |
233 void BackgroundContents::CreateNewWidget(int route_id, | 235 void BackgroundContents::CreateNewWidget(int route_id, |
234 WebKit::WebPopupType popup_type) { | 236 WebKit::WebPopupType popup_type) { |
235 NOTREACHED(); | 237 NOTREACHED(); |
236 } | 238 } |
237 | 239 |
(...skipping 23 matching lines...) Expand all Loading... |
261 BackgroundContents* | 263 BackgroundContents* |
262 BackgroundContents::GetBackgroundContentsByID(int render_process_id, | 264 BackgroundContents::GetBackgroundContentsByID(int render_process_id, |
263 int render_view_id) { | 265 int render_view_id) { |
264 RenderViewHost* render_view_host = | 266 RenderViewHost* render_view_host = |
265 RenderViewHost::FromID(render_process_id, render_view_id); | 267 RenderViewHost::FromID(render_process_id, render_view_id); |
266 if (!render_view_host) | 268 if (!render_view_host) |
267 return NULL; | 269 return NULL; |
268 | 270 |
269 return render_view_host->delegate()->GetAsBackgroundContents(); | 271 return render_view_host->delegate()->GetAsBackgroundContents(); |
270 } | 272 } |
OLD | NEW |