chrome/browser/chromeos/app_mode/startup_app_launcher.h - Issue 43203002: Remove hacks added to workaround a system salt issue for M31

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

Issue 43203002: Remove hacks added to workaround a system salt issue for M31 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 7 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 | Annotate | Revision Log

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 #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_H_	5 #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_H_

6 #define CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_H_	6 #define CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
71 std::string refresh_token;	71 std::string refresh_token;

72 std::string client_id;	72 std::string client_id;

73 std::string client_secret;	73 std::string client_secret;

74 };	74 };

75	75

76 void OnLaunchSuccess();	76 void OnLaunchSuccess();

77 void OnLaunchFailure(KioskAppLaunchError::Error error);	77 void OnLaunchFailure(KioskAppLaunchError::Error error);

78	78

79 void BeginInstall();	79 void BeginInstall();

80 void InstallCallback(bool success, const std::string& error);	80 void InstallCallback(bool success, const std::string& error);

81 void EnsureSystemSaltIsLoaded();	81 void EnsureSystemSaltIsLoaded();
	hashimoto 2013/10/25 05:17:03 nit: Remove this line. nit: Remove this line. satorux1 2013/10/25 05:23:57 Done. Show quoted text On 2013/10/25 05:17:03, hashimoto wrote: > nit: Remove this line. Done.
82 void OnReadyToLaunch(const std::string& system_salt);	82 void OnReadyToLaunch();

83	83

84 void InitializeTokenService();	84 void InitializeTokenService();

85 void InitializeNetwork();	85 void InitializeNetwork();

86	86

87 void StartLoadingOAuthFile();	87 void StartLoadingOAuthFile();

88 static void LoadOAuthFileOnBlockingPool(KioskOAuthParams* auth_params);	88 static void LoadOAuthFileOnBlockingPool(KioskOAuthParams* auth_params);

89 void OnOAuthFileLoaded(KioskOAuthParams* auth_params);	89 void OnOAuthFileLoaded(KioskOAuthParams* auth_params);

90	90

91 // OAuth2TokenService::Observer overrides.	91 // OAuth2TokenService::Observer overrides.

92 virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;	92 virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;

(...skipping 10 matching lines...) Expand all Loading...
103	103

104 scoped_refptr<extensions::WebstoreStandaloneInstaller> installer_;	104 scoped_refptr<extensions::WebstoreStandaloneInstaller> installer_;

105 KioskOAuthParams auth_params_;	105 KioskOAuthParams auth_params_;

106	106

107 DISALLOW_COPY_AND_ASSIGN(StartupAppLauncher);	107 DISALLOW_COPY_AND_ASSIGN(StartupAppLauncher);

108 };	108 };

109	109

110 } // namespace chromeos	110 } // namespace chromeos

111	111

112 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_H_	112 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_H_

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/chromeos/app_mode/startup_app_launcher.cc » ('j') | chrome/browser/chromeos/settings/device_oauth2_token_service.cc » ('J')