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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.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_UI_WEBUI_CHROMEOS_LOGIN_APP_LAUNCH_SPLASH_SCREEN_HANDLER_ H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_APP_LAUNCH_SPLASH_SCREEN_HANDLER_ H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_APP_LAUNCH_SPLASH_SCREEN_HANDLER_ H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_APP_LAUNCH_SPLASH_SCREEN_HANDLER_ H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 // NetworkStateInformer::NetworkStateInformerObserver implementation: 48 // NetworkStateInformer::NetworkStateInformerObserver implementation:
49 virtual void OnNetworkReady() OVERRIDE; 49 virtual void OnNetworkReady() OVERRIDE;
50 virtual void UpdateState(ErrorScreenActor::ErrorReason reason) OVERRIDE; 50 virtual void UpdateState(ErrorScreenActor::ErrorReason reason) OVERRIDE;
51 51
52 private: 52 private:
53 void PopulateAppInfo(base::DictionaryValue* out_info); 53 void PopulateAppInfo(base::DictionaryValue* out_info);
54 void SetLaunchText(const std::string& text); 54 void SetLaunchText(const std::string& text);
55 int GetProgressMessageFromState(AppLaunchState state); 55 int GetProgressMessageFromState(AppLaunchState state);
56 void HandleConfigureNetwork(); 56 void HandleConfigureNetwork();
57 void HandleCancelAppLaunch(); 57 void HandleCancelAppLaunch();
58 void HandleContinueAppLaunch();
59 void HandleNetworkConfigRequested();
60 58
61 AppLaunchSplashScreenHandler::Delegate* delegate_; 59 AppLaunchSplashScreenHandler::Delegate* delegate_;
62 bool show_on_init_; 60 bool show_on_init_;
63 std::string app_id_; 61 std::string app_id_;
64 AppLaunchState state_; 62 AppLaunchState state_;
65 63
66 scoped_refptr<NetworkStateInformer> network_state_informer_; 64 scoped_refptr<NetworkStateInformer> network_state_informer_;
67 ErrorScreenActor* error_screen_actor_; 65 ErrorScreenActor* error_screen_actor_;
68 // True if we are online.
69 bool online_state_;
70 // True if we have network config screen was already shown before.
71 bool network_config_done_;
72 // True if we have manually requested network config screen.
73 bool network_config_requested_;
74 66
75 DISALLOW_COPY_AND_ASSIGN(AppLaunchSplashScreenHandler); 67 DISALLOW_COPY_AND_ASSIGN(AppLaunchSplashScreenHandler);
76 }; 68 };
77 69
78 } // namespace chromeos 70 } // namespace chromeos
79 71
80 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_APP_LAUNCH_SPLASH_SCREEN_HANDL ER_H_ 72 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_APP_LAUNCH_SPLASH_SCREEN_HANDL ER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698