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

Side by Side Diff: chrome/browser/chromeos/app_mode/startup_app_launcher.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 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 #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h" 5 #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/json/json_file_value_serializer.h" 9 #include "base/json/json_file_value_serializer.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 OnLaunchFailure(KioskAppLaunchError::NOT_KIOSK_ENABLED); 242 OnLaunchFailure(KioskAppLaunchError::NOT_KIOSK_ENABLED);
243 return; 243 return;
244 } 244 }
245 245
246 // Always open the app in a window. 246 // Always open the app in a window.
247 OpenApplication(AppLaunchParams(profile_, extension, 247 OpenApplication(AppLaunchParams(profile_, extension,
248 extensions::LAUNCH_CONTAINER_WINDOW, 248 extensions::LAUNCH_CONTAINER_WINDOW,
249 NEW_WINDOW)); 249 NEW_WINDOW));
250 InitAppSession(profile_, app_id_); 250 InitAppSession(profile_, app_id_);
251 251
252 UserManager::Get()->SessionStarted(); 252 GetUserManager()->SessionStarted();
253 253
254 content::NotificationService::current()->Notify( 254 content::NotificationService::current()->Notify(
255 chrome::NOTIFICATION_KIOSK_APP_LAUNCHED, 255 chrome::NOTIFICATION_KIOSK_APP_LAUNCHED,
256 content::NotificationService::AllSources(), 256 content::NotificationService::AllSources(),
257 content::NotificationService::NoDetails()); 257 content::NotificationService::NoDetails());
258 258
259 if (diagnostic_mode_) 259 if (diagnostic_mode_)
260 KioskDiagnosisRunner::Run(profile_, app_id_); 260 KioskDiagnosisRunner::Run(profile_, app_id_);
261 261
262 OnLaunchSuccess(); 262 OnLaunchSuccess();
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 ready_to_launch_ = true; 344 ready_to_launch_ = true;
345 delegate_->OnReadyToLaunch(); 345 delegate_->OnReadyToLaunch();
346 } 346 }
347 347
348 void StartupAppLauncher::UpdateAppData() { 348 void StartupAppLauncher::UpdateAppData() {
349 KioskAppManager::Get()->ClearAppData(app_id_); 349 KioskAppManager::Get()->ClearAppData(app_id_);
350 KioskAppManager::Get()->UpdateAppDataFromProfile(app_id_, profile_, NULL); 350 KioskAppManager::Get()->UpdateAppDataFromProfile(app_id_, profile_, NULL);
351 } 351 }
352 352
353 } // namespace chromeos 353 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698