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

Unified Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.h

Issue 2865003003: Put OOBE UI on touch display if no keyboard detected (Closed)
Patch Set: Created 3 years, 7 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/ui/webui/chromeos/login/oobe_ui.h
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
index 035cbbdc9bbc346dc46f5145ea48be3859f7d40a..c0e92ef9e1ba1d282120e32b73333524ca263675 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
@@ -53,6 +53,7 @@ class NativeWindowDelegate;
class NetworkDropdownHandler;
class NetworkStateInformer;
class NetworkView;
+class OobeDisplayChooser;
class SigninScreenHandler;
class SigninScreenHandlerDelegate;
class SupervisedUserCreationScreenHandler;
@@ -170,6 +171,8 @@ class OobeUI : public content::WebUIController,
// changed).
void UpdateLocalizedStringsIfNeeded();
+ void OnDisplayAdded(const display::Display& new_display);
jdufault 2017/05/08 17:44:58 Add comment.
jdufault 2017/05/08 17:44:58 |new_display| is unused, remove it. Is OnDisplayCo
Felix Ekblom 2017/05/09 08:54:50 I've assumed only one touch display for the initia
Felix Ekblom 2017/05/10 10:59:13 I renamed the method according to your suggestion
+
private:
// Lookup a view by its statically registered OobeScreen.
template <typename TView>
@@ -241,6 +244,8 @@ class OobeUI : public content::WebUIController,
std::unique_ptr<ash::ScreenDimmer> screen_dimmer_;
+ std::unique_ptr<OobeDisplayChooser> oobe_display_chooser_;
+
// Store the deferred JS calls before the screen handler instance is
// initialized.
std::unique_ptr<JSCallsContainer> js_calls_container;

Powered by Google App Engine
This is Rietveld 408576698