diff options
Diffstat (limited to 'chrome/browser/ui/views/extensions')
| -rw-r--r-- | chrome/browser/ui/views/extensions/extension_dialog.cc | 20 | ||||
| -rw-r--r-- | chrome/browser/ui/views/extensions/extension_dialog.h | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/views/extensions/extension_popup.cc | 9 |
3 files changed, 7 insertions, 25 deletions
diff --git a/chrome/browser/ui/views/extensions/extension_dialog.cc b/chrome/browser/ui/views/extensions/extension_dialog.cc index 9bcc1a3..b6a084b 100644 --- a/chrome/browser/ui/views/extensions/extension_dialog.cc +++ b/chrome/browser/ui/views/extensions/extension_dialog.cc @@ -6,8 +6,7 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_process_manager.h" -#include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/extensions/extension_host_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/constrained_window_views.h" #include "chrome/browser/ui/views/extensions/extension_dialog_observer.h" @@ -56,7 +55,8 @@ ExtensionDialog* ExtensionDialog::Show( int min_height, const string16& title, ExtensionDialogObserver* observer) { - extensions::ExtensionHost* host = CreateExtensionHost(url, profile); + extensions::ExtensionHost* host = + extensions::ExtensionHostFactory::CreateDialogHost(url, profile); if (!host) return NULL; // Preferred size must be set before views::Widget::CreateWindowWithParent @@ -80,20 +80,6 @@ ExtensionDialog* ExtensionDialog::Show( return dialog; } -// static -extensions::ExtensionHost* ExtensionDialog::CreateExtensionHost( - const GURL& url, - Profile* profile) { - DCHECK(profile); - ExtensionProcessManager* manager = - extensions::ExtensionSystem::Get(profile)->process_manager(); - - DCHECK(manager); - if (!manager) - return NULL; - return manager->CreateDialogHost(url); -} - void ExtensionDialog::InitWindow(ui::BaseWindow* base_window, int width, int height) { diff --git a/chrome/browser/ui/views/extensions/extension_dialog.h b/chrome/browser/ui/views/extensions/extension_dialog.h index 1f02a69..626a871 100644 --- a/chrome/browser/ui/views/extensions/extension_dialog.h +++ b/chrome/browser/ui/views/extensions/extension_dialog.h @@ -101,9 +101,6 @@ class ExtensionDialog : public views::DialogDelegate, const string16& title, ExtensionDialogObserver* observer); - static extensions::ExtensionHost* CreateExtensionHost(const GURL& url, - Profile* profile); - void InitWindow(ui::BaseWindow* base_window, int width, int height); // Window Title diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc index 7b8d4ef..9adb006 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc @@ -8,8 +8,8 @@ #include "base/message_loop/message_loop.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/devtools/devtools_window.h" -#include "chrome/browser/extensions/extension_process_manager.h" -#include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/extensions/extension_host.h" +#include "chrome/browser/extensions/extension_host_factory.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -167,9 +167,8 @@ ExtensionPopup* ExtensionPopup::ShowPopup(const GURL& url, views::View* anchor_view, views::BubbleBorder::Arrow arrow, ShowAction show_action) { - ExtensionProcessManager* manager = - extensions::ExtensionSystem::Get(browser->profile())->process_manager(); - extensions::ExtensionHost* host = manager->CreatePopupHost(url, browser); + extensions::ExtensionHost* host = + extensions::ExtensionHostFactory::CreatePopupHost(url, browser); ExtensionPopup* popup = new ExtensionPopup(host, anchor_view, arrow, show_action); views::BubbleDelegateView::CreateBubble(popup); |