Screensaver at login screen.

chrome/browser/ui/views/extensions/extension_dialog.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/extensions/extension_dialog.h"
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/dialog_style.h"
 #include "chrome/browser/ui/views/extensions/extension_dialog_observer.h"
 #include "chrome/browser/ui/views/window.h"  // CreateViewsWindow
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ skipping 31 matching lines @@
 
 // static
 ExtensionDialog* ExtensionDialog::Show(
     const GURL& url,
     Browser* browser,
     WebContents* web_contents,
     int width,
     int height,
     const string16& title,
     ExtensionDialogObserver* observer) {
-  return ExtensionDialog::ShowInternal(url, browser, web_contents, width,
-                                       height, false, title, observer);
+  ExtensionHost* host = CreateExtensionHost(url, browser, NULL);
+  if (!host)
+    return NULL;
+  host->set_associated_web_contents(web_contents);
+
+  return ExtensionDialog::ShowInternal(url, browser, host, width, height,
+                                       false, title, observer);
 }
 
 #if defined(USE_AURA)
 // static
 ExtensionDialog* ExtensionDialog::ShowFullscreen(
     const GURL& url,
-    Browser* browser,
-    WebContents* web_contents,
+    Profile* profile,
     const string16& title,
     ExtensionDialogObserver* observer) {
-  return ExtensionDialog::ShowInternal(url, browser, web_contents, 0, 0,
+  ExtensionHost* host = CreateExtensionHost(url, NULL, profile);
+  if (!host)
+    return NULL;
+
+  return ExtensionDialog::ShowInternal(url, NULL, host, 0, 0,
                                        true, title, observer);
 }
 #endif
 
 // static
 ExtensionDialog* ExtensionDialog::ShowInternal(const GURL& url,
     Browser* browser,
-    content::WebContents* web_contents,
+    ExtensionHost* host,
     int width,
     int height,
     bool fullscreen,
     const string16& title,
     ExtensionDialogObserver* observer) {
-  CHECK(browser);
-  ExtensionHost* host = CreateExtensionHost(url, browser);
-  if (!host)
-    return NULL;
-  host->set_associated_web_contents(web_contents);
-
+  CHECK(fullscreen || browser);
   ExtensionDialog* dialog = new ExtensionDialog(host, observer);
   dialog->set_title(title);
+
   if (fullscreen)
-    dialog->InitWindowFullscreen(browser);
+    dialog->InitWindowFullscreen();
   else
     dialog->InitWindow(browser, width, height);
 
   // Show a white background while the extension loads.  This is prettier than
   // flashing a black unfilled window frame.
   host->view()->set_background(
       views::Background::CreateSolidBackground(0xFF, 0xFF, 0xFF));
   host->view()->SetVisible(true);
 
   // Ensure the DOM JavaScript can respond immediately to keyboard shortcuts.
   host->host_contents()->Focus();
   return dialog;
 }
 
 // static
 ExtensionHost* ExtensionDialog::CreateExtensionHost(const GURL& url,
-                                                    Browser* browser) {
-  ExtensionProcessManager* manager =
-      browser->profile()->GetExtensionProcessManager();
+                                                    Browser* browser,
+                                                    Profile* profile) {
+  // Prefer picking the extension manager from the profile if given.
+  ExtensionProcessManager* manager = NULL;
+  if (profile)
+    manager = profile->GetExtensionProcessManager();
+  else
+    manager = browser->profile()->GetExtensionProcessManager();
+
   DCHECK(manager);
   if (!manager)
     return NULL;
-  return manager->CreateDialogHost(url, browser);
+  if (browser)
+    return manager->CreateDialogHost(url, browser);
+  else
+    return manager->CreatePopupHost(url, browser);

[Yoyo Zhou, 2012/02/24 21:51:05]

browser is NULL here; it's clearer to make NULL be the argument.

[rkc, 2012/02/25 02:14:02]

Done.

 }
 
 #if defined(USE_AURA)
-void ExtensionDialog::InitWindowFullscreen(Browser* browser) {
-  gfx::NativeWindow parent = browser->window()->GetNativeHandle();
-
+void ExtensionDialog::InitWindowFullscreen() {

[sky, 2012/02/24 05:03:53]

Looks like you still have the browser in the one place that calls this. How come
you need to move it? I ask as it's best to get the rootwindow from an existing
window rather than like this.

[rkc, 2012/02/25 02:14:02]

Done.

+  aura::RootWindow* root_window = aura::RootWindow::GetInstance();
   // Create the window as a child of the root window.
   window_ = browser::CreateFramelessViewsWindow(
-      parent->GetRootWindow(), this);
+      root_window, this);
   // Make sure we're always on top by putting ourselves at the top
   // of the z-order of the child windows of the root window.
-  parent->GetRootWindow()->StackChildAtTop(window_->GetNativeWindow());
+  root_window->StackChildAtTop(window_->GetNativeWindow());
 
-  int width = parent->GetRootWindow()->GetHostSize().width();
-  int height = parent->GetRootWindow()->GetHostSize().height();
+  int width = root_window->GetHostSize().width();
+  int height = root_window->GetHostSize().height();
   window_->SetBounds(gfx::Rect(0, 0, width, height));
 
   window_->Show();
   // TODO(jamescook): Remove redundant call to Activate()?
   window_->Activate();
 }
 #else
-void ExtensionDialog::InitWindowFullscreen(Browser* browser) {
+void ExtensionDialog::InitWindowFullscreen() {
   NOTIMPLEMENTED();
 }
 #endif
 
 
 void ExtensionDialog::InitWindow(Browser* browser, int width, int height) {
   gfx::NativeWindow parent = browser->window()->GetNativeHandle();
 #if defined(OS_CHROMEOS)
   DialogStyle style = STYLE_FLUSH;
 #else
@@ skipping 87 matching lines @@
       if (content::Details<ExtensionHost>(host()) != details)
         return;
       if (observer_)
         observer_->ExtensionTerminated(this);
       break;
     default:
       NOTREACHED() << L"Received unexpected notification";
       break;
   }
 }