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

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

Issue 8774022: Converting BubbleWindow uses, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Doesn't build... just a checkpoint for this work, might change approach. Created 9 years 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_html_dialog.h
diff --git a/chrome/browser/chromeos/login/login_html_dialog.h b/chrome/browser/chromeos/login/login_html_dialog.h
index 4d4e2a23a84091f8d7706c8499731428dc6179ad..5cd438d3007c572206881453f60393709a8997ea 100644
--- a/chrome/browser/chromeos/login/login_html_dialog.h
+++ b/chrome/browser/chromeos/login/login_html_dialog.h
@@ -10,18 +10,14 @@
#include "base/compiler_specific.h"
#include "chrome/browser/ui/webui/html_dialog_ui.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
#include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/size.h"
namespace chromeos {
class BubbleFrameView;
// Launches html dialog during OOBE/Login with specified URL and title.
-class LoginHtmlDialog : public HtmlDialogUIDelegate,
- public content::NotificationObserver {
+class LoginHtmlDialog : public HtmlDialogUIDelegate {
public:
// Delegate class to get notifications from the dialog.
class Delegate {
@@ -32,16 +28,10 @@ class LoginHtmlDialog : public HtmlDialogUIDelegate,
virtual void OnDialogClosed();
};
- enum Style {
- STYLE_GENERIC, // Use generic CreateChromeWindow as a host.
- STYLE_BUBBLE // Use chromeos::BubbleWindow as a host.
- };
-
LoginHtmlDialog(Delegate* delegate,
gfx::NativeWindow parent_window,
const std::wstring& title,
- const GURL& url,
- Style style);
+ const GURL& url);
virtual ~LoginHtmlDialog();
// Shows created dialog.
@@ -69,11 +59,6 @@ class LoginHtmlDialog : public HtmlDialogUIDelegate,
virtual bool ShouldShowDialogTitle() const OVERRIDE;
virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE;
- // content::NotificationObserver implementation.
- virtual void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
-
private:
// Notifications receiver.
Delegate* delegate_;
@@ -81,9 +66,6 @@ class LoginHtmlDialog : public HtmlDialogUIDelegate,
gfx::NativeWindow parent_window_;
string16 title_;
GURL url_;
- Style style_;
- content::NotificationRegistrar notification_registrar_;
- BubbleFrameView* bubble_frame_view_;
bool is_open_;
// Dialog display size.
« no previous file with comments | « chrome/browser/chromeos/login/help_app_launcher.cc ('k') | chrome/browser/chromeos/login/login_html_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698