Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3050)

Unified Diff: chrome/browser/ui/views/extensions/extension_dialog.h

Issue 9455038: Screensaver at login screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: and another build fix.. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_;
« no previous file with comments | « chrome/browser/chromeos/ui/screensaver_extension_dialog.cc ('k') | chrome/browser/ui/views/extensions/extension_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698