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

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

Issue 2738973003: cros: WIP patch to remove EnableDebuggingScreenView
Patch Set: Initial upload Created 3 years, 9 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 a9796391815e6c91f1a5c00704e9c900a353d1da..40f5af86810498b25cdcab063d5cb610aa07233d 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
@@ -37,7 +37,6 @@ class BaseScreenHandler;
class ControllerPairingScreenView;
class CoreOobeView;
class DeviceDisabledScreenView;
-class EnableDebuggingScreenView;
class EnrollmentScreenView;
class EulaView;
class ErrorScreen;
@@ -48,6 +47,7 @@ class KioskAppMenuHandler;
class KioskAutolaunchScreenView;
class KioskEnableScreenView;
class LoginScreenContext;
+class MulticastCoreOobeView;
class NativeWindowDelegate;
class NetworkDropdownHandler;
class NetworkStateInformer;
@@ -96,7 +96,6 @@ class OobeUI : public content::WebUIController,
NetworkView* GetNetworkView();
EulaView* GetEulaView();
UpdateView* GetUpdateView();
- EnableDebuggingScreenView* GetEnableDebuggingScreenView();
EnrollmentScreenView* GetEnrollmentScreenView();
ResetView* GetResetView();
KioskAutolaunchScreenView* GetKioskAutolaunchScreenView();
@@ -206,6 +205,10 @@ class OobeUI : public content::WebUIController,
// forwards calls from native code to JS side.
SigninScreenHandler* signin_screen_handler_ = nullptr;
+ // This delegate is used whenever any code wants a CoreOobeView. It will
+ // dispatch the CoreOobeView calls to all of the implementations.
+ std::unique_ptr<MulticastCoreOobeView> core_oobe_view_;
+
std::vector<BaseWebUIHandler*> webui_handlers_; // Non-owning pointers.
std::vector<BaseScreenHandler*> screen_handlers_; // Non-owning pointers.
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/multicast_core_oobe_view.cc ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698