Index: chrome/browser/ui/views/extensions/extension_dialog.h |
diff --git a/chrome/browser/ui/views/extensions/extension_dialog.h b/chrome/browser/ui/views/extensions/extension_dialog.h |
index 65b65f06a21511a9f4709ebb30e7afd5c43c745e..47b91b5fd2bdaa738b156a0e9b51126830135773 100644 |
--- a/chrome/browser/ui/views/extensions/extension_dialog.h |
+++ b/chrome/browser/ui/views/extensions/extension_dialog.h |
@@ -7,6 +7,7 @@ |
#pragma once |
#include "base/memory/ref_counted.h" |
+#include "base/logging.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
#include "ui/views/widget/widget_delegate.h" |
@@ -15,6 +16,7 @@ class Browser; |
class ExtensionDialogObserver; |
class ExtensionHost; |
class GURL; |
+class Profile; |
namespace content { |
class WebContents; |
@@ -43,13 +45,20 @@ class ExtensionDialog : public views::WidgetDelegate, |
#if defined(USE_AURA) |
// Create and show a fullscreen dialog with |url|. |
- // |browser| is the browser to which the pop-up will be attached. |
+ // |profile| is the profile that the extension is registered with. |
// |web_contents| is the tab that spawned the dialog. |
static ExtensionDialog* ShowFullscreen(const GURL& url, |
- Browser* browser, |
- content::WebContents* web_contents, |
+ Profile* profile, |
const string16& title, |
ExtensionDialogObserver* observer); |
+#else |
+ static ExtensionDialog* ShowFullscreen(const GURL& url, |
+ Profile* profile, |
+ const string16& title, |
+ ExtensionDialogObserver* observer) { |
+ NOTIMPLEMENTED(); |
+ return NULL; |
+ } |
#endif |
// Notifies the dialog that the observer has been destroyed and should not |
@@ -86,7 +95,7 @@ class ExtensionDialog : public views::WidgetDelegate, |
static ExtensionDialog* ShowInternal(const GURL& url, |
Browser* browser, |
- content::WebContents* web_contents, |
+ ExtensionHost* host, |
int width, |
int height, |
bool fullscreen, |
@@ -94,10 +103,11 @@ class ExtensionDialog : public views::WidgetDelegate, |
ExtensionDialogObserver* observer); |
static ExtensionHost* CreateExtensionHost(const GURL& url, |
- Browser* browser); |
+ Browser* browser, |
+ Profile* profile); |
void InitWindow(Browser* browser, int width, int height); |
- void InitWindowFullscreen(Browser* browser); |
+ void InitWindowFullscreen(); |
// Window that holds the extension host view. |
views::Widget* window_; |