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

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

Issue 250863002: kiosk: Fix unable to type in input fields. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/chromeos/login/app_launch_controller.h" 5 #include "chrome/browser/chromeos/login/app_launch_controller.h"
6 6
7 #include "apps/app_window.h" 7 #include "apps/app_window.h"
8 #include "apps/app_window_registry.h" 8 #include "apps/app_window_registry.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 if (online && !network_config_requested_) 233 if (online && !network_config_requested_)
234 startup_app_launcher_->ContinueWithNetworkReady(); 234 startup_app_launcher_->ContinueWithNetworkReady();
235 else if (network_wait_timedout_) 235 else if (network_wait_timedout_)
236 MaybeShowNetworkConfigureUI(); 236 MaybeShowNetworkConfigureUI();
237 } 237 }
238 238
239 void AppLaunchController::OnProfileLoaded(Profile* profile) { 239 void AppLaunchController::OnProfileLoaded(Profile* profile) {
240 DVLOG(1) << "Profile loaded... Starting app launch."; 240 DVLOG(1) << "Profile loaded... Starting app launch.";
241 profile_ = profile; 241 profile_ = profile;
242 242
243 // This is needed to trigger input method extensions being loaded.
244 profile_->InitChromeOSPreferences();
Nikita (slow) 2014/04/28 13:04:17 Should this use similar approach as in https://cod
xiyuan 2014/04/28 16:38:32 OAuth2LoginManager code is not executed for kiosk.
245
243 kiosk_profile_loader_.reset(); 246 kiosk_profile_loader_.reset();
244 startup_app_launcher_.reset( 247 startup_app_launcher_.reset(
245 new StartupAppLauncher(profile_, app_id_, diagnostic_mode_, this)); 248 new StartupAppLauncher(profile_, app_id_, diagnostic_mode_, this));
246 startup_app_launcher_->Initialize(); 249 startup_app_launcher_->Initialize();
247 } 250 }
248 251
249 void AppLaunchController::OnProfileLoadFailed( 252 void AppLaunchController::OnProfileLoadFailed(
250 KioskAppLaunchError::Error error) { 253 KioskAppLaunchError::Error error) {
251 OnLaunchFailed(error); 254 OnLaunchFailed(error);
252 } 255 }
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 KioskAppLaunchError::Save(error); 420 KioskAppLaunchError::Save(error);
418 chrome::AttemptUserExit(); 421 chrome::AttemptUserExit();
419 CleanUp(); 422 CleanUp();
420 } 423 }
421 424
422 bool AppLaunchController::IsShowingNetworkConfigScreen() { 425 bool AppLaunchController::IsShowingNetworkConfigScreen() {
423 return network_config_requested_; 426 return network_config_requested_;
424 } 427 }
425 428
426 } // namespace chromeos 429 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698