| 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 "ui/views/controls/webview/webview.h" | 5 #include "ui/views/controls/webview/webview.h" |
| 6 | 6 |
| 7 #include "content/public/browser/browser_context.h" | 7 #include "content/public/browser/browser_context.h" |
| 8 #include "content/public/browser/navigation_controller.h" | 8 #include "content/public/browser/navigation_controller.h" |
| 9 #include "content/public/browser/notification_details.h" | 9 #include "content/public/browser/notification_details.h" |
| 10 #include "content/public/browser/notification_registrar.h" | 10 #include "content/public/browser/notification_registrar.h" |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 content::WebContents* contents = NULL; | 242 content::WebContents* contents = NULL; |
| 243 if (ViewsDelegate::views_delegate) { | 243 if (ViewsDelegate::views_delegate) { |
| 244 contents = ViewsDelegate::views_delegate->CreateWebContents( | 244 contents = ViewsDelegate::views_delegate->CreateWebContents( |
| 245 browser_context, site_instance); | 245 browser_context, site_instance); |
| 246 } | 246 } |
| 247 | 247 |
| 248 if (!contents) { | 248 if (!contents) { |
| 249 return content::WebContents::Create(browser_context, | 249 return content::WebContents::Create(browser_context, |
| 250 site_instance, | 250 site_instance, |
| 251 MSG_ROUTING_NONE, | 251 MSG_ROUTING_NONE, |
| 252 NULL, | |
| 253 NULL); | 252 NULL); |
| 254 } | 253 } |
| 255 | 254 |
| 256 return contents; | 255 return contents; |
| 257 } | 256 } |
| 258 | 257 |
| 259 } // namespace views | 258 } // namespace views |
| OLD | NEW |