chrome/browser/chromeos/app_mode/startup_app_launcher.cc - Issue 1269773002: Cleanup VersionInfo after componentization.

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

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 4 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

OLD	NEW
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"

11 #include "base/time/time.h"	11 #include "base/time/time.h"

12 #include "base/values.h"	12 #include "base/values.h"

13 #include "chrome/browser/chrome_notification_types.h"	13 #include "chrome/browser/chrome_notification_types.h"

14 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"	14 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"

15 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"	15 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"

16 #include "chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.h"	16 #include "chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.h"

17 #include "chrome/browser/chromeos/login/session/user_session_manager.h"	17 #include "chrome/browser/chromeos/login/session/user_session_manager.h"

18 #include "chrome/browser/extensions/extension_service.h"	18 #include "chrome/browser/extensions/extension_service.h"

19 #include "chrome/browser/extensions/install_tracker.h"	19 #include "chrome/browser/extensions/install_tracker.h"

20 #include "chrome/browser/extensions/install_tracker_factory.h"	20 #include "chrome/browser/extensions/install_tracker_factory.h"

21 #include "chrome/browser/extensions/updater/extension_updater.h"	21 #include "chrome/browser/extensions/updater/extension_updater.h"

22 #include "chrome/browser/lifetime/application_lifetime.h"	22 #include "chrome/browser/lifetime/application_lifetime.h"

23 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"	23 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

24 #include "chrome/browser/signin/signin_manager_factory.h"	24 #include "chrome/browser/signin/signin_manager_factory.h"

25 #include "chrome/browser/ui/extensions/app_launch_params.h"	25 #include "chrome/browser/ui/extensions/app_launch_params.h"

26 #include "chrome/browser/ui/extensions/application_launch.h"	26 #include "chrome/browser/ui/extensions/application_launch.h"

27 #include "chrome/common/chrome_paths.h"	27 #include "chrome/common/chrome_paths.h"

28 #include "chrome/common/chrome_switches.h"	28 #include "chrome/common/chrome_switches.h"

29 #include "chrome/common/chrome_version_info.h"

30 #include "components/crx_file/id_util.h"	29 #include "components/crx_file/id_util.h"

31 #include "components/signin/core/browser/profile_oauth2_token_service.h"	30 #include "components/signin/core/browser/profile_oauth2_token_service.h"

32 #include "components/signin/core/browser/signin_manager.h"	31 #include "components/signin/core/browser/signin_manager.h"

33 #include "components/user_manager/user_manager.h"	32 #include "components/user_manager/user_manager.h"

34 #include "content/public/browser/browser_thread.h"	33 #include "content/public/browser/browser_thread.h"

35 #include "content/public/browser/notification_service.h"	34 #include "content/public/browser/notification_service.h"

36 #include "extensions/browser/extension_system.h"	35 #include "extensions/browser/extension_system.h"

37 #include "extensions/common/constants.h"	36 #include "extensions/common/constants.h"

38 #include "extensions/common/extension.h"	37 #include "extensions/common/extension.h"

39 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"	38 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"

(...skipping 357 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
397 UpdateAppData();	396 UpdateAppData();

398 delegate_->OnReadyToLaunch();	397 delegate_->OnReadyToLaunch();

399 }	398 }

400	399

401 void StartupAppLauncher::UpdateAppData() {	400 void StartupAppLauncher::UpdateAppData() {

402 KioskAppManager::Get()->ClearAppData(app_id_);	401 KioskAppManager::Get()->ClearAppData(app_id_);

403 KioskAppManager::Get()->UpdateAppDataFromProfile(app_id_, profile_, NULL);	402 KioskAppManager::Get()->UpdateAppDataFromProfile(app_id_, profile_, NULL);

404 }	403 }

405	404

406 } // namespace chromeos	405 } // namespace chromeos

OLD	NEW