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

Side by Side Diff: chrome/browser/chromeos/first_run/first_run.cc

Issue 1141163003: Enabled first-run tutorial for ephemeral users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/metrics/histogram.h" 6 #include "base/metrics/histogram.h"
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/chromeos/first_run/first_run_controller.h" 10 #include "chrome/browser/chromeos/first_run/first_run_controller.h"
11 #include "chrome/browser/chromeos/profiles/profile_helper.h" 11 #include "chrome/browser/chromeos/profiles/profile_helper.h"
12 #include "chrome/browser/extensions/extension_service.h" 12 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/browser/prefs/pref_service_syncable.h"
13 #include "chrome/browser/profiles/profile_manager.h" 14 #include "chrome/browser/profiles/profile_manager.h"
14 #include "chrome/browser/ui/extensions/app_launch_params.h" 15 #include "chrome/browser/ui/extensions/app_launch_params.h"
15 #include "chrome/browser/ui/extensions/application_launch.h" 16 #include "chrome/browser/ui/extensions/application_launch.h"
16 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
17 #include "chrome/common/extensions/extension_constants.h" 18 #include "chrome/common/extensions/extension_constants.h"
18 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
19 #include "chromeos/chromeos_switches.h" 20 #include "chromeos/chromeos_switches.h"
20 #include "components/pref_registry/pref_registry_syncable.h" 21 #include "components/pref_registry/pref_registry_syncable.h"
21 #include "components/user_manager/user_manager.h" 22 #include "components/user_manager/user_manager.h"
22 #include "content/public/browser/notification_observer.h" 23 #include "content/public/browser/notification_observer.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 DCHECK(content::Details<const user_manager::User>(details).ptr() == 70 DCHECK(content::Details<const user_manager::User>(details).ptr() ==
70 ProfileHelper::Get()->GetUserByProfile(profile_)); 71 ProfileHelper::Get()->GetUserByProfile(profile_));
71 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 72 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
72 bool launched_in_test = command_line->HasSwitch(::switches::kTestType); 73 bool launched_in_test = command_line->HasSwitch(::switches::kTestType);
73 bool launched_in_telemetry = 74 bool launched_in_telemetry =
74 command_line->HasSwitch(switches::kOobeSkipPostLogin); 75 command_line->HasSwitch(switches::kOobeSkipPostLogin);
75 bool is_user_new = user_manager::UserManager::Get()->IsCurrentUserNew(); 76 bool is_user_new = user_manager::UserManager::Get()->IsCurrentUserNew();
76 bool first_run_forced = command_line->HasSwitch(switches::kForceFirstRunUI); 77 bool first_run_forced = command_line->HasSwitch(switches::kForceFirstRunUI);
77 bool first_run_seen = 78 bool first_run_seen =
78 profile_->GetPrefs()->GetBoolean(prefs::kFirstRunTutorialShown); 79 profile_->GetPrefs()->GetBoolean(prefs::kFirstRunTutorialShown);
80 bool is_pref_synced =
81 PrefServiceSyncable::FromProfile(profile_)->IsPrioritySyncing();
82 bool is_user_ephemeral = user_manager::UserManager::Get()
83 ->IsCurrentUserNonCryptohomeDataEphemeral();
79 if (!launched_in_telemetry && 84 if (!launched_in_telemetry &&
80 ((is_user_new && !first_run_seen && !launched_in_test) || 85 ((is_user_new && !first_run_seen &&
86 (is_pref_synced || !is_user_ephemeral) && !launched_in_test) ||
81 first_run_forced)) { 87 first_run_forced)) {
82 LaunchDialogForProfile(profile_); 88 LaunchDialogForProfile(profile_);
83 } 89 }
84 delete this; 90 delete this;
85 } 91 }
86 92
87 private: 93 private:
88 Profile* profile_; 94 Profile* profile_;
89 content::NotificationRegistrar registrar_; 95 content::NotificationRegistrar registrar_;
90 96
(...skipping 14 matching lines...) Expand all
105 user_manager::UserManager::Get()->GetActiveUser())); 111 user_manager::UserManager::Get()->GetActiveUser()));
106 } 112 }
107 113
108 void LaunchTutorial() { 114 void LaunchTutorial() {
109 UMA_HISTOGRAM_BOOLEAN("CrosFirstRun.TutorialLaunched", true); 115 UMA_HISTOGRAM_BOOLEAN("CrosFirstRun.TutorialLaunched", true);
110 FirstRunController::Start(); 116 FirstRunController::Start();
111 } 117 }
112 118
113 } // namespace first_run 119 } // namespace first_run
114 } // namespace chromeos 120 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698