projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
ui
/
webui
/
chromeos
/
login
/
error_screen_handler.h
diff --git
a/src/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
b/src/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
index
94014de
..
c419dcf
100644
(file)
--- a/
src/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
+++ b/
src/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
@@
-34,6
+34,9
@@
class ErrorScreenHandler : public BaseScreenHandler,
virtual void SetDelegate(ErrorScreenActorDelegate* delegate) OVERRIDE;
virtual void Show(OobeDisplay::Screen parent_screen,
base::DictionaryValue* params) OVERRIDE;
virtual void SetDelegate(ErrorScreenActorDelegate* delegate) OVERRIDE;
virtual void Show(OobeDisplay::Screen parent_screen,
base::DictionaryValue* params) OVERRIDE;
+ virtual void Show(OobeDisplay::Screen parent_screen,
+ base::DictionaryValue* params,
+ const base::Closure& on_hide) OVERRIDE;
virtual void Hide() OVERRIDE;
virtual void FixCaptivePortal() OVERRIDE;
virtual void ShowCaptivePortal() OVERRIDE;
virtual void Hide() OVERRIDE;
virtual void FixCaptivePortal() OVERRIDE;
virtual void ShowCaptivePortal() OVERRIDE;
@@
-51,6
+54,9
@@
class ErrorScreenHandler : public BaseScreenHandler,
bool GetScreenName(OobeUI::Screen screen, std::string* name) const;
bool GetScreenName(OobeUI::Screen screen, std::string* name) const;
+ // Default hide_closure for Show/Hide.
+ void CheckAndShowScreen();
+
// WebUI message handlers.
void HandleShowCaptivePortal();
void HandleHideCaptivePortal();
// WebUI message handlers.
void HandleShowCaptivePortal();
void HandleHideCaptivePortal();
@@
-82,6
+88,10
@@
class ErrorScreenHandler : public BaseScreenHandler,
// Keeps whether screen should be shown right after initialization.
bool show_on_init_;
// Keeps whether screen should be shown right after initialization.
bool show_on_init_;
+ scoped_ptr<base::Closure> on_hide_;
+
+ base::WeakPtrFactory<ErrorScreenHandler> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(ErrorScreenHandler);
};
DISALLOW_COPY_AND_ASSIGN(ErrorScreenHandler);
};