| 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/extensions/extension_host.h" | 5 #include "chrome/browser/extensions/extension_host.h" |
| 6 | 6 |
| 7 #include <list> | 7 #include <list> |
| 8 | 8 |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/singleton.h" | 10 #include "base/singleton.h" |
| (...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 TabContents* associated_contents = associated_tab_contents(); | 553 TabContents* associated_contents = associated_tab_contents(); |
| 554 if (associated_contents && associated_contents->delegate()) | 554 if (associated_contents && associated_contents->delegate()) |
| 555 associated_contents->delegate()->TabContentsCreated(new_contents); | 555 associated_contents->delegate()->TabContentsCreated(new_contents); |
| 556 } | 556 } |
| 557 | 557 |
| 558 void ExtensionHost::CreateNewWidget(int route_id, | 558 void ExtensionHost::CreateNewWidget(int route_id, |
| 559 WebKit::WebPopupType popup_type) { | 559 WebKit::WebPopupType popup_type) { |
| 560 CreateNewWidgetInternal(route_id, popup_type); | 560 CreateNewWidgetInternal(route_id, popup_type); |
| 561 } | 561 } |
| 562 | 562 |
| 563 void ExtensionHost::CreateNewFullscreenWidget(int route_id, | 563 void ExtensionHost::CreateNewFullscreenWidget(int route_id) { |
| 564 WebKit::WebPopupType popup_type) { | |
| 565 NOTREACHED() | 564 NOTREACHED() |
| 566 << "ExtensionHost does not support showing full screen popups yet."; | 565 << "ExtensionHost does not support showing full screen popups yet."; |
| 567 } | 566 } |
| 568 | 567 |
| 569 RenderWidgetHostView* ExtensionHost::CreateNewWidgetInternal( | 568 RenderWidgetHostView* ExtensionHost::CreateNewWidgetInternal( |
| 570 int route_id, WebKit::WebPopupType popup_type) { | 569 int route_id, WebKit::WebPopupType popup_type) { |
| 571 return delegate_view_helper_.CreateNewWidget(route_id, popup_type, | 570 return delegate_view_helper_.CreateNewWidget(route_id, popup_type, |
| 572 site_instance()->GetProcess()); | 571 site_instance()->GetProcess()); |
| 573 } | 572 } |
| 574 | 573 |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 814 } | 813 } |
| 815 return window_id; | 814 return window_id; |
| 816 } | 815 } |
| 817 | 816 |
| 818 void ExtensionHost::OnRunFileChooser( | 817 void ExtensionHost::OnRunFileChooser( |
| 819 const ViewHostMsg_RunFileChooser_Params& params) { | 818 const ViewHostMsg_RunFileChooser_Params& params) { |
| 820 if (file_select_helper_.get() == NULL) | 819 if (file_select_helper_.get() == NULL) |
| 821 file_select_helper_.reset(new FileSelectHelper(profile())); | 820 file_select_helper_.reset(new FileSelectHelper(profile())); |
| 822 file_select_helper_->RunFileChooser(render_view_host_, params); | 821 file_select_helper_->RunFileChooser(render_view_host_, params); |
| 823 } | 822 } |
| OLD | NEW |