| 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/browsing_instance.h" | 8 #include "chrome/browser/browsing_instance.h" |
| 9 #include "chrome/browser/desktop_notification_handler.h" | 9 #include "chrome/browser/desktop_notification_handler.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 this, | 227 this, |
| 228 params.window_container_type, | 228 params.window_container_type, |
| 229 params.frame_name); | 229 params.frame_name); |
| 230 } | 230 } |
| 231 | 231 |
| 232 void BackgroundContents::CreateNewWidget(int route_id, | 232 void BackgroundContents::CreateNewWidget(int route_id, |
| 233 WebKit::WebPopupType popup_type) { | 233 WebKit::WebPopupType popup_type) { |
| 234 NOTREACHED(); | 234 NOTREACHED(); |
| 235 } | 235 } |
| 236 | 236 |
| 237 void BackgroundContents::CreateNewFullscreenWidget( | 237 void BackgroundContents::CreateNewFullscreenWidget(int route_id) { |
| 238 int route_id, WebKit::WebPopupType popup_type) { | |
| 239 NOTREACHED(); | 238 NOTREACHED(); |
| 240 } | 239 } |
| 241 | 240 |
| 242 void BackgroundContents::ShowCreatedWindow(int route_id, | 241 void BackgroundContents::ShowCreatedWindow(int route_id, |
| 243 WindowOpenDisposition disposition, | 242 WindowOpenDisposition disposition, |
| 244 const gfx::Rect& initial_pos, | 243 const gfx::Rect& initial_pos, |
| 245 bool user_gesture) { | 244 bool user_gesture) { |
| 246 TabContents* contents = delegate_view_helper_.GetCreatedWindow(route_id); | 245 TabContents* contents = delegate_view_helper_.GetCreatedWindow(route_id); |
| 247 if (contents) | 246 if (contents) |
| 248 delegate_->AddTabContents(contents, disposition, initial_pos, user_gesture); | 247 delegate_->AddTabContents(contents, disposition, initial_pos, user_gesture); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 261 BackgroundContents* | 260 BackgroundContents* |
| 262 BackgroundContents::GetBackgroundContentsByID(int render_process_id, | 261 BackgroundContents::GetBackgroundContentsByID(int render_process_id, |
| 263 int render_view_id) { | 262 int render_view_id) { |
| 264 RenderViewHost* render_view_host = | 263 RenderViewHost* render_view_host = |
| 265 RenderViewHost::FromID(render_process_id, render_view_id); | 264 RenderViewHost::FromID(render_process_id, render_view_id); |
| 266 if (!render_view_host) | 265 if (!render_view_host) |
| 267 return NULL; | 266 return NULL; |
| 268 | 267 |
| 269 return render_view_host->delegate()->GetAsBackgroundContents(); | 268 return render_view_host->delegate()->GetAsBackgroundContents(); |
| 270 } | 269 } |
| OLD | NEW |