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

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

Issue 1547093002: Switch to standard integer types in chrome/browser/chromeos/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
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 #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 <stdint.h>
9
8 #include <string> 10 #include <string>
9 11
10 #include "base/basictypes.h"
11 #include "base/callback_forward.h" 12 #include "base/callback_forward.h"
13 #include "base/macros.h"
12 #include "base/timer/timer.h" 14 #include "base/timer/timer.h"
13 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 15 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
14 #include "chrome/browser/chromeos/app_mode/kiosk_profile_loader.h" 16 #include "chrome/browser/chromeos/app_mode/kiosk_profile_loader.h"
15 #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h" 17 #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h"
16 #include "chrome/browser/chromeos/login/app_launch_signin_screen.h" 18 #include "chrome/browser/chromeos/login/app_launch_signin_screen.h"
17 #include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h " 19 #include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h "
18 #include "content/public/browser/notification_observer.h" 20 #include "content/public/browser/notification_observer.h"
19 #include "content/public/browser/notification_registrar.h" 21 #include "content/public/browser/notification_registrar.h"
20 22
21 class Profile; 23 class Profile;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 bool launcher_ready_; 130 bool launcher_ready_;
129 131
130 // A timer to ensure the app splash is shown for a minimum amount of time. 132 // A timer to ensure the app splash is shown for a minimum amount of time.
131 base::OneShotTimer splash_wait_timer_; 133 base::OneShotTimer splash_wait_timer_;
132 134
133 base::OneShotTimer network_wait_timer_; 135 base::OneShotTimer network_wait_timer_;
134 bool waiting_for_network_; 136 bool waiting_for_network_;
135 bool network_wait_timedout_; 137 bool network_wait_timedout_;
136 bool showing_network_dialog_; 138 bool showing_network_dialog_;
137 bool network_config_requested_; 139 bool network_config_requested_;
138 int64 launch_splash_start_time_; 140 int64_t launch_splash_start_time_;
139 141
140 static bool skip_splash_wait_; 142 static bool skip_splash_wait_;
141 static int network_wait_time_; 143 static int network_wait_time_;
142 static base::Closure* network_timeout_callback_; 144 static base::Closure* network_timeout_callback_;
143 static ReturnBoolCallback* can_configure_network_callback_; 145 static ReturnBoolCallback* can_configure_network_callback_;
144 static ReturnBoolCallback* need_owner_auth_to_configure_network_callback_; 146 static ReturnBoolCallback* need_owner_auth_to_configure_network_callback_;
145 147
146 DISALLOW_COPY_AND_ASSIGN(AppLaunchController); 148 DISALLOW_COPY_AND_ASSIGN(AppLaunchController);
147 }; 149 };
148 150
149 } // namespace chromeos 151 } // namespace chromeos
150 152
151 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_ 153 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/locale_change_guard_unittest.cc ('k') | chrome/browser/chromeos/login/app_launch_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698