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

Unified Diff: chrome/browser/chromeos/ui/inline_login_dialog.h

Issue 256623002: Implemented inline login dialog for Chrome OS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed. Created 6 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/ui/inline_login_dialog.h
diff --git a/ui/web_dialogs/test/test_web_dialog_delegate.h b/chrome/browser/chromeos/ui/inline_login_dialog.h
similarity index 52%
copy from ui/web_dialogs/test/test_web_dialog_delegate.h
copy to chrome/browser/chromeos/ui/inline_login_dialog.h
index 18a73b2558d328f8fffd2adcdcb862df618711d5..c21d1485434b4d54163b19094342a04861140920 100644
--- a/ui/web_dialogs/test/test_web_dialog_delegate.h
+++ b/chrome/browser/chromeos/ui/inline_login_dialog.h
@@ -1,50 +1,45 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
-#ifndef UI_WEB_DIALOGS_TEST_TEST_WEB_DIALOG_DELEGATE_H_
-#define UI_WEB_DIALOGS_TEST_TEST_WEB_DIALOG_DELEGATE_H_
-
-#include <string>
+#ifndef CHROME_BROWSER_CHROMEOS_UI_INLINE_LOGIN_DIALOG_H_
+#define CHROME_BROWSER_CHROMEOS_UI_INLINE_LOGIN_DIALOG_H_
#include "base/compiler_specific.h"
-#include "ui/gfx/size.h"
+#include "base/macros.h"
#include "ui/web_dialogs/web_dialog_delegate.h"
-#include "url/gurl.h"
+
+namespace content {
+class BrowserContext;
+}
namespace ui {
-namespace test {
-class TestWebDialogDelegate : public WebDialogDelegate {
+class InlineLoginDialog : public ui::WebDialogDelegate {
public:
- explicit TestWebDialogDelegate(const GURL& url);
- virtual ~TestWebDialogDelegate();
+ static void Show(content::BrowserContext* context);
- void set_size(int width, int height) {
- size_.SetSize(width, height);
- }
+ private:
+ InlineLoginDialog();
+ virtual ~InlineLoginDialog();
- // WebDialogDelegate implementation:
- virtual ModalType GetDialogModalType() const OVERRIDE;
+ // Overriden from WebDialogDelegate.
+ virtual ui::ModalType GetDialogModalType() const OVERRIDE;
Roger Tawa OOO till Jul 10th 2014/04/28 19:06:22 Why extra ui:: here and line 18 above if this is a
dzhioev (left Google) 2014/04/28 19:49:17 Done.
virtual base::string16 GetDialogTitle() const OVERRIDE;
virtual GURL GetDialogContentURL() const OVERRIDE;
virtual void GetWebUIMessageHandlers(
std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE;
virtual void GetDialogSize(gfx::Size* size) const OVERRIDE;
virtual std::string GetDialogArgs() const OVERRIDE;
+ virtual bool CanResizeDialog() const OVERRIDE;
virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE;
virtual void OnCloseContents(content::WebContents* source,
bool* out_close_dialog) OVERRIDE;
virtual bool ShouldShowDialogTitle() const OVERRIDE;
- protected:
- const GURL url_;
- gfx::Size size_;
-
- DISALLOW_COPY_AND_ASSIGN(TestWebDialogDelegate);
+ DISALLOW_COPY_AND_ASSIGN(InlineLoginDialog);
};
-} // namespace test
} // namespace ui
-#endif // UI_WEB_DIALOGS_TEST_TEST_WEB_DIALOG_DELEGATE_H_
+#endif // CHROME_BROWSER_CHROMEOS_UI_INLINE_LOGIN_DIALOG_H_

Powered by Google App Engine
This is Rietveld 408576698