chrome/browser/chromeos/login/app_launch_controller.h - Issue 982993002: Tentative fix for the crash when calling StartupAppLauncher::ContinueWithNetworkReady by clear the …

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

Issue 982993002: Tentative fix for the crash when calling StartupAppLauncher::ContinueWithNetworkReady by clear the … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « no previous file | chrome/browser/chromeos/login/app_launch_controller.cc » ('j') | chrome/browser/chromeos/login/app_launch_controller.cc » ('J')

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_LOGIN_APP_LAUNCH_CONTROLLER_H_	5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_

6 #define CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_	6 #define CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_

7	7

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

9	9

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

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
59 static void SetNetworkWaitForTesting(int wait_time_secs);	59 static void SetNetworkWaitForTesting(int wait_time_secs);

60 static void SetCanConfigureNetworkCallbackForTesting(	60 static void SetCanConfigureNetworkCallbackForTesting(

61 ReturnBoolCallback* can_configure_network_callback);	61 ReturnBoolCallback* can_configure_network_callback);

62 static void SetNeedOwnerAuthToConfigureNetworkCallbackForTesting(	62 static void SetNeedOwnerAuthToConfigureNetworkCallbackForTesting(

63 ReturnBoolCallback* need_owner_auth_callback);	63 ReturnBoolCallback* need_owner_auth_callback);

64	64

65 private:	65 private:

66 // A class to watch app window creation.	66 // A class to watch app window creation.

67 class AppWindowWatcher;	67 class AppWindowWatcher;

68	68

	69 void ClearNetworkWaitTimer();

69 void CleanUp();	70 void CleanUp();

70 void OnNetworkWaitTimedout();	71 void OnNetworkWaitTimedout();

71	72

72 // Callback of AppWindowWatcher to notify an app window is created.	73 // Callback of AppWindowWatcher to notify an app window is created.

73 void OnAppWindowCreated();	74 void OnAppWindowCreated();

74	75

75 // Whether the network could be configured during launching.	76 // Whether the network could be configured during launching.

76 bool CanConfigureNetwork();	77 bool CanConfigureNetwork();

77	78

78 // Whether the owner password is needed to configure network.	79 // Whether the owner password is needed to configure network.

(...skipping 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141 static base::Closure* network_timeout_callback_;	142 static base::Closure* network_timeout_callback_;

142 static ReturnBoolCallback* can_configure_network_callback_;	143 static ReturnBoolCallback* can_configure_network_callback_;

143 static ReturnBoolCallback* need_owner_auth_to_configure_network_callback_;	144 static ReturnBoolCallback* need_owner_auth_to_configure_network_callback_;

144	145

145 DISALLOW_COPY_AND_ASSIGN(AppLaunchController);	146 DISALLOW_COPY_AND_ASSIGN(AppLaunchController);

146 };	147 };

147	148

148 } // namespace chromeos	149 } // namespace chromeos

149	150

150 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_	151 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_

OLD	NEW