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

Side by Side Diff: chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

Issue 1428353002: Network Setup from Shark to Remora. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address achuithb@'s comment. Created 5 years, 1 month 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "chrome/browser/chromeos/login/screens/controller_pairing_screen.h" 5 #include "chrome/browser/chromeos/login/screens/controller_pairing_screen.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chromeos/login/wizard_controller.h" 9 #include "chrome/browser/chromeos/login/wizard_controller.h"
10 #include "google_apis/gaia/gaia_auth_util.h" 10 #include "google_apis/gaia/gaia_auth_util.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 desired_page = kPageEstablishingConnectionError; 94 desired_page = kPageEstablishingConnectionError;
95 break; 95 break;
96 } 96 }
97 case ControllerPairingController::STAGE_WAITING_FOR_CODE_CONFIRMATION: { 97 case ControllerPairingController::STAGE_WAITING_FOR_CODE_CONFIRMATION: {
98 desired_page = kPageCodeConfirmation; 98 desired_page = kPageCodeConfirmation;
99 context_.SetString(kContextKeyConfirmationCode, 99 context_.SetString(kContextKeyConfirmationCode,
100 shark_controller_->GetConfirmationCode()); 100 shark_controller_->GetConfirmationCode());
101 break; 101 break;
102 } 102 }
103 case ControllerPairingController::STAGE_PAIRING_DONE: { 103 case ControllerPairingController::STAGE_PAIRING_DONE: {
104 if (delegate_) 104 if (delegate_) {
105 delegate_->SetHostNetwork();
105 delegate_->SetHostConfiguration(); 106 delegate_->SetHostConfiguration();
107 }
106 break; 108 break;
107 } 109 }
108 case ControllerPairingController::STAGE_HOST_UPDATE_IN_PROGRESS: { 110 case ControllerPairingController::STAGE_HOST_UPDATE_IN_PROGRESS: {
109 desired_page = kPageHostUpdate; 111 desired_page = kPageHostUpdate;
110 break; 112 break;
111 } 113 }
112 case ControllerPairingController::STAGE_HOST_CONNECTION_LOST: { 114 case ControllerPairingController::STAGE_HOST_CONNECTION_LOST: {
113 desired_page = kPageHostConnectionLost; 115 desired_page = kPageHostConnectionLost;
114 break; 116 break;
115 } 117 }
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 ++key) { 212 ++key) {
211 if (*key == kContextKeySelectedDevice) { 213 if (*key == kContextKeySelectedDevice) {
212 context_.SetBoolean(kContextKeyControlsDisabled, 214 context_.SetBoolean(kContextKeyControlsDisabled,
213 context_.GetString(*key).empty()); 215 context_.GetString(*key).empty());
214 CommitContextChanges(); 216 CommitContextChanges();
215 } 217 }
216 } 218 }
217 } 219 }
218 220
219 } // namespace chromeos 221 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698