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

Unified Diff: chrome/browser/chromeos/app_mode/startup_app_launcher.cc

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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/app_mode/startup_app_launcher.cc
diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
index a7b8828dd67d8531bbffd4f4380b2e8b70e65779..94e3ef68d66b369956e85d970023e1e19e5008ae 100644
--- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
+++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
@@ -148,18 +148,6 @@
InitializeTokenService();
}
-void StartupAppLauncher::RestartLauncher() {
- // If the installer is still running in the background, we don't need to
- // restart the launch process. We will just wait until it completes and
- // lunches the kiosk app.
- if (installer_ != NULL) {
- LOG(WARNING) << "Installer still running";
- return;
- }
-
- MaybeInitializeNetwork();
-}
-
void StartupAppLauncher::MaybeInitializeNetwork() {
network_ready_handled_ = false;
@@ -307,11 +295,6 @@
void StartupAppLauncher::InstallCallback(bool success,
const std::string& error) {
installer_ = NULL;
- if (delegate_->IsShowingNetworkConfigScreen()) {
- LOG(WARNING) << "Showing network config screen";
- return;
- }
-
if (success) {
// Finish initialization after the callback returns.
// So that the app finishes its installation.
« no previous file with comments | « chrome/browser/chromeos/app_mode/startup_app_launcher.h ('k') | chrome/browser/chromeos/login/app_launch_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698