| 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/extensions/extension_host.h" | 5 #include "chrome/browser/extensions/extension_host.h" |
| 6 | 6 |
| 7 #include <list> | 7 #include <list> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 message, content, source_url, request_id, has_callback); | 548 message, content, source_url, request_id, has_callback); |
| 549 } | 549 } |
| 550 } | 550 } |
| 551 | 551 |
| 552 RenderViewHostDelegate::View* ExtensionHost::GetViewDelegate() { | 552 RenderViewHostDelegate::View* ExtensionHost::GetViewDelegate() { |
| 553 return this; | 553 return this; |
| 554 } | 554 } |
| 555 | 555 |
| 556 void ExtensionHost::CreateNewWindow( | 556 void ExtensionHost::CreateNewWindow( |
| 557 int route_id, | 557 int route_id, |
| 558 WindowContainerType window_container_type) { | 558 WindowContainerType window_container_type, |
| 559 const string16& frame_name) { |
| 559 delegate_view_helper_.CreateNewWindow( | 560 delegate_view_helper_.CreateNewWindow( |
| 560 route_id, | 561 route_id, |
| 561 render_view_host()->process()->profile(), | 562 render_view_host()->process()->profile(), |
| 562 site_instance(), | 563 site_instance(), |
| 563 DOMUIFactory::GetDOMUIType(url_), | 564 DOMUIFactory::GetDOMUIType(url_), |
| 564 this, | 565 this, |
| 565 window_container_type); | 566 window_container_type, |
| 567 frame_name); |
| 566 } | 568 } |
| 567 | 569 |
| 568 void ExtensionHost::CreateNewWidget(int route_id, | 570 void ExtensionHost::CreateNewWidget(int route_id, |
| 569 WebKit::WebPopupType popup_type) { | 571 WebKit::WebPopupType popup_type) { |
| 570 CreateNewWidgetInternal(route_id, popup_type); | 572 CreateNewWidgetInternal(route_id, popup_type); |
| 571 } | 573 } |
| 572 | 574 |
| 573 RenderWidgetHostView* ExtensionHost::CreateNewWidgetInternal( | 575 RenderWidgetHostView* ExtensionHost::CreateNewWidgetInternal( |
| 574 int route_id, WebKit::WebPopupType popup_type) { | 576 int route_id, WebKit::WebPopupType popup_type) { |
| 575 return delegate_view_helper_.CreateNewWidget(route_id, popup_type, | 577 return delegate_view_helper_.CreateNewWidget(route_id, popup_type, |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 729 // Extensions hosted in ExternalTabContainer objects may not have | 731 // Extensions hosted in ExternalTabContainer objects may not have |
| 730 // an associated browser. | 732 // an associated browser. |
| 731 Browser* browser = GetBrowser(); | 733 Browser* browser = GetBrowser(); |
| 732 if (browser) | 734 if (browser) |
| 733 window_id = ExtensionTabUtil::GetWindowId(browser); | 735 window_id = ExtensionTabUtil::GetWindowId(browser); |
| 734 } else if (extension_host_type_ != ViewType::EXTENSION_BACKGROUND_PAGE) { | 736 } else if (extension_host_type_ != ViewType::EXTENSION_BACKGROUND_PAGE) { |
| 735 NOTREACHED(); | 737 NOTREACHED(); |
| 736 } | 738 } |
| 737 return window_id; | 739 return window_id; |
| 738 } | 740 } |
| OLD | NEW |