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

Unified Diff: chrome/browser/chromeos/login/login_display_host.h

Issue 13878010: Merge WebUILoginDisplayHost into LoginDisplayHostImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge + move method definition Created 7 years, 8 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/chromeos/login/login_display_host.h
diff --git a/chrome/browser/chromeos/login/login_display_host.h b/chrome/browser/chromeos/login/login_display_host.h
index 7f9d3cf37cef0f8d7120f8da100049136bf1b3a1..15f4f6467908a3a44450e4532ceab8e59c70333a 100644
--- a/chrome/browser/chromeos/login/login_display_host.h
+++ b/chrome/browser/chromeos/login/login_display_host.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "chrome/browser/chromeos/customization_document.h"
#include "chrome/browser/chromeos/login/login_display.h"
@@ -18,6 +19,7 @@ class Widget;
namespace chromeos {
+class WebUILoginView;
class WizardController;
// An interface that defines OOBE/login screen host.
@@ -35,6 +37,9 @@ class LoginDisplayHost {
// Returns corresponding native window.
virtual gfx::NativeWindow GetNativeWindow() const = 0;
+ // Returns the current login view.
+ virtual WebUILoginView* GetWebUILoginView() const = 0;
+
// Returns corresponding widget.
virtual views::Widget* GetWidget() const = 0;
@@ -70,7 +75,7 @@ class LoginDisplayHost {
// Takes ownership of |screen_parameters|, which can also be NULL.
virtual void StartWizard(
const std::string& first_screen_name,
- DictionaryValue* screen_parameters) = 0;
+ scoped_ptr<DictionaryValue> screen_parameters) = 0;
// Returns current WizardController, if it exists.
// Result should not be stored.
« no previous file with comments | « chrome/browser/chromeos/login/kiosk_browsertest.cc ('k') | chrome/browser/chromeos/login/login_display_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698