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

Side by Side Diff: chrome/browser/chromeos/login/app_launch_controller.h

Issue 213253007: Revert of Added shortcut for NW config screen in kiosk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 // owner password might be checked before showing the network configure UI. 80 // owner password might be checked before showing the network configure UI.
81 void MaybeShowNetworkConfigureUI(); 81 void MaybeShowNetworkConfigureUI();
82 82
83 // KioskProfileLoader::Delegate overrides: 83 // KioskProfileLoader::Delegate overrides:
84 virtual void OnProfileLoaded(Profile* profile) OVERRIDE; 84 virtual void OnProfileLoaded(Profile* profile) OVERRIDE;
85 virtual void OnProfileLoadFailed(KioskAppLaunchError::Error error) OVERRIDE; 85 virtual void OnProfileLoadFailed(KioskAppLaunchError::Error error) OVERRIDE;
86 86
87 // AppLaunchSplashScreenActor::Delegate overrides: 87 // AppLaunchSplashScreenActor::Delegate overrides:
88 virtual void OnConfigureNetwork() OVERRIDE; 88 virtual void OnConfigureNetwork() OVERRIDE;
89 virtual void OnCancelAppLaunch() OVERRIDE; 89 virtual void OnCancelAppLaunch() OVERRIDE;
90 virtual void OnNetworkConfigRequested(bool requested) OVERRIDE;
91 virtual void OnNetworkStateChanged(bool online) OVERRIDE; 90 virtual void OnNetworkStateChanged(bool online) OVERRIDE;
92 91
93 // StartupAppLauncher::Delegate overrides: 92 // StartupAppLauncher::Delegate overrides:
94 virtual void InitializeNetwork() OVERRIDE; 93 virtual void InitializeNetwork() OVERRIDE;
95 virtual bool IsNetworkReady() OVERRIDE; 94 virtual bool IsNetworkReady() OVERRIDE;
96 virtual void OnLoadingOAuthFile() OVERRIDE; 95 virtual void OnLoadingOAuthFile() OVERRIDE;
97 virtual void OnInitializingTokenService() OVERRIDE; 96 virtual void OnInitializingTokenService() OVERRIDE;
98 virtual void OnInstallingApp() OVERRIDE; 97 virtual void OnInstallingApp() OVERRIDE;
99 virtual void OnReadyToLaunch() OVERRIDE; 98 virtual void OnReadyToLaunch() OVERRIDE;
100 virtual void OnLaunchSucceeded() OVERRIDE; 99 virtual void OnLaunchSucceeded() OVERRIDE;
101 virtual void OnLaunchFailed(KioskAppLaunchError::Error error) OVERRIDE; 100 virtual void OnLaunchFailed(KioskAppLaunchError::Error error) OVERRIDE;
102 virtual bool IsShowingNetworkConfigScreen() OVERRIDE;
103 101
104 // AppLaunchSigninScreen::Delegate overrides: 102 // AppLaunchSigninScreen::Delegate overrides:
105 virtual void OnOwnerSigninSuccess() OVERRIDE; 103 virtual void OnOwnerSigninSuccess() OVERRIDE;
106 104
107 // content::NotificationObserver overrides: 105 // content::NotificationObserver overrides:
108 virtual void Observe(int type, 106 virtual void Observe(int type,
109 const content::NotificationSource& source, 107 const content::NotificationSource& source,
110 const content::NotificationDetails& details) OVERRIDE; 108 const content::NotificationDetails& details) OVERRIDE;
111 109
112 Profile* profile_; 110 Profile* profile_;
(...skipping 11 matching lines...) Expand all
124 bool webui_visible_; 122 bool webui_visible_;
125 bool launcher_ready_; 123 bool launcher_ready_;
126 124
127 // A timer to ensure the app splash is shown for a minimum amount of time. 125 // A timer to ensure the app splash is shown for a minimum amount of time.
128 base::OneShotTimer<AppLaunchController> splash_wait_timer_; 126 base::OneShotTimer<AppLaunchController> splash_wait_timer_;
129 127
130 base::OneShotTimer<AppLaunchController> network_wait_timer_; 128 base::OneShotTimer<AppLaunchController> network_wait_timer_;
131 bool waiting_for_network_; 129 bool waiting_for_network_;
132 bool network_wait_timedout_; 130 bool network_wait_timedout_;
133 bool showing_network_dialog_; 131 bool showing_network_dialog_;
134 bool network_config_requested_;
135 int64 launch_splash_start_time_; 132 int64 launch_splash_start_time_;
136 133
137 static bool skip_splash_wait_; 134 static bool skip_splash_wait_;
138 static int network_wait_time_; 135 static int network_wait_time_;
139 static base::Closure* network_timeout_callback_; 136 static base::Closure* network_timeout_callback_;
140 static ReturnBoolCallback* can_configure_network_callback_; 137 static ReturnBoolCallback* can_configure_network_callback_;
141 static ReturnBoolCallback* need_owner_auth_to_configure_network_callback_; 138 static ReturnBoolCallback* need_owner_auth_to_configure_network_callback_;
142 139
143 DISALLOW_COPY_AND_ASSIGN(AppLaunchController); 140 DISALLOW_COPY_AND_ASSIGN(AppLaunchController);
144 }; 141 };
145 142
146 } // namespace chromeos 143 } // namespace chromeos
147 144
148 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_ 145 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/app_mode/startup_app_launcher.cc ('k') | chrome/browser/chromeos/login/app_launch_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698