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

Unified Diff: chrome/browser/chromeos/first_run/first_run_controller.cc

Issue 549453005: Run athena on device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
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() {
« no previous file with comments | « chrome/browser/chromeos/dbus/cros_dbus_service.cc ('k') | chrome/browser/chromeos/login/lock/screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698