| Index: chrome/browser/chromeos/first_run/first_run_controller.cc
|
| diff --git a/chrome/browser/chromeos/first_run/first_run_controller.cc b/chrome/browser/chromeos/first_run/first_run_controller.cc
|
| index 02b8cf18f3bdc038baa9618b612688b698a4fee7..7febfa85bdc8161eda5cf839ed01d8fadbe34a0d 100644
|
| --- a/chrome/browser/chromeos/first_run/first_run_controller.cc
|
| +++ b/chrome/browser/chromeos/first_run/first_run_controller.cc
|
| @@ -40,16 +40,20 @@ FirstRunController::~FirstRunController() {}
|
|
|
| // static
|
| void FirstRunController::Start() {
|
| +#if !defined(USE_ATHENA)
|
| + // crbug.com/413914
|
| if (g_instance) {
|
| LOG(WARNING) << "First-run tutorial is running already.";
|
| return;
|
| }
|
| g_instance = new FirstRunController();
|
| g_instance->Init();
|
| +#endif
|
| }
|
|
|
| // static
|
| void FirstRunController::Stop() {
|
| +#if !defined(USE_ATHENA)
|
| if (!g_instance) {
|
| LOG(WARNING) << "First-run tutorial is not running.";
|
| return;
|
| @@ -57,6 +61,7 @@ void FirstRunController::Stop() {
|
| g_instance->Finalize();
|
| base::MessageLoop::current()->DeleteSoon(FROM_HERE, g_instance);
|
| g_instance = NULL;
|
| +#endif
|
| }
|
|
|
| FirstRunController* FirstRunController::GetInstanceForTest() {
|
|
|