| 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 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 } | 506 } |
| 507 | 507 |
| 508 void ExtensionHost::CreateNewWindow( | 508 void ExtensionHost::CreateNewWindow( |
| 509 int route_id, | 509 int route_id, |
| 510 WindowContainerType window_container_type, | 510 WindowContainerType window_container_type, |
| 511 const string16& frame_name) { | 511 const string16& frame_name) { |
| 512 delegate_view_helper_.CreateNewWindow( | 512 delegate_view_helper_.CreateNewWindow( |
| 513 route_id, | 513 route_id, |
| 514 render_view_host()->process()->profile(), | 514 render_view_host()->process()->profile(), |
| 515 site_instance(), | 515 site_instance(), |
| 516 DOMUIFactory::GetDOMUIType(url_), | 516 DOMUIFactory::GetDOMUIType(render_view_host()->process()->profile(), |
| 517 url_), |
| 517 this, | 518 this, |
| 518 window_container_type, | 519 window_container_type, |
| 519 frame_name); | 520 frame_name); |
| 520 } | 521 } |
| 521 | 522 |
| 522 void ExtensionHost::CreateNewWidget(int route_id, | 523 void ExtensionHost::CreateNewWidget(int route_id, |
| 523 WebKit::WebPopupType popup_type) { | 524 WebKit::WebPopupType popup_type) { |
| 524 CreateNewWidgetInternal(route_id, popup_type); | 525 CreateNewWidgetInternal(route_id, popup_type); |
| 525 } | 526 } |
| 526 | 527 |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 // Extensions hosted in ExternalTabContainer objects may not have | 692 // Extensions hosted in ExternalTabContainer objects may not have |
| 692 // an associated browser. | 693 // an associated browser. |
| 693 Browser* browser = GetBrowser(); | 694 Browser* browser = GetBrowser(); |
| 694 if (browser) | 695 if (browser) |
| 695 window_id = ExtensionTabUtil::GetWindowId(browser); | 696 window_id = ExtensionTabUtil::GetWindowId(browser); |
| 696 } else if (extension_host_type_ != ViewType::EXTENSION_BACKGROUND_PAGE) { | 697 } else if (extension_host_type_ != ViewType::EXTENSION_BACKGROUND_PAGE) { |
| 697 NOTREACHED(); | 698 NOTREACHED(); |
| 698 } | 699 } |
| 699 return window_id; | 700 return window_id; |
| 700 } | 701 } |
| OLD | NEW |