| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/render_view_host_delegate_helper.h" | 5 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "chrome/browser/browser.h" | 9 #include "chrome/browser/browser.h" |
| 10 #include "chrome/browser/character_encoding.h" | 10 #include "chrome/browser/character_encoding.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 return false; | 49 return false; |
| 50 | 50 |
| 51 return true; | 51 return true; |
| 52 } | 52 } |
| 53 TabContents* RenderViewHostDelegateViewHelper::CreateNewWindow( | 53 TabContents* RenderViewHostDelegateViewHelper::CreateNewWindow( |
| 54 int route_id, | 54 int route_id, |
| 55 Profile* profile, | 55 Profile* profile, |
| 56 SiteInstance* site, | 56 SiteInstance* site, |
| 57 DOMUITypeID domui_type, | 57 DOMUITypeID domui_type, |
| 58 RenderViewHostDelegate* opener, | 58 RenderViewHostDelegate* opener, |
| 59 WindowContainerType window_container_type) { | 59 WindowContainerType window_container_type, |
| 60 const string16& frame_name) { |
| 60 if (ShouldOpenBackgroundContents(window_container_type, | 61 if (ShouldOpenBackgroundContents(window_container_type, |
| 61 opener->GetURL(), | 62 opener->GetURL(), |
| 62 site->GetProcess(), | 63 site->GetProcess(), |
| 63 profile)) { | 64 profile)) { |
| 64 BackgroundContents* contents = new BackgroundContents(site, route_id); | 65 BackgroundContents* contents = new BackgroundContents(site, route_id); |
| 65 pending_contents_[route_id] = contents->render_view_host(); | 66 pending_contents_[route_id] = contents->render_view_host(); |
| 66 return NULL; | 67 return NULL; |
| 67 } | 68 } |
| 68 | 69 |
| 69 // Create the new web contents. This will automatically create the new | 70 // Create the new web contents. This will automatically create the new |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 } | 269 } |
| 269 DCHECK(!web_prefs.default_encoding.empty()); | 270 DCHECK(!web_prefs.default_encoding.empty()); |
| 270 | 271 |
| 271 if (is_dom_ui) { | 272 if (is_dom_ui) { |
| 272 web_prefs.loads_images_automatically = true; | 273 web_prefs.loads_images_automatically = true; |
| 273 web_prefs.javascript_enabled = true; | 274 web_prefs.javascript_enabled = true; |
| 274 } | 275 } |
| 275 | 276 |
| 276 return web_prefs; | 277 return web_prefs; |
| 277 } | 278 } |
| OLD | NEW |