summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-29 21:37:33 +0000
committerdpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-29 21:37:33 +0000
commit9be397295d7e12ce2f86e92472f5d10bdd9c6369 (patch)
tree868e69aba6a5df5e81522c33890b1e5d8a136efc
parentd1fb68ff58bce58ffab930cad1182cf439d27847 (diff)
downloadchromium_src-9be397295d7e12ce2f86e92472f5d10bdd9c6369.zip
chromium_src-9be397295d7e12ce2f86e92472f5d10bdd9c6369.tar.gz
chromium_src-9be397295d7e12ce2f86e92472f5d10bdd9c6369.tar.bz2
Merge 67585 - Load Get Started app from local directory
BUG=http://code.google.com/p/chromium-os/issues/detail?id=5914 TEST=manual Review URL: http://codereview.chromium.org/5256005 TBR=dpolukhin@chromium.org Review URL: http://codereview.chromium.org/5397002 git-svn-id: svn://svn.chromium.org/chrome/branches/552d/src@67592 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/login/existing_user_controller.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 1a6ecb7..07160cc 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -62,7 +62,10 @@ const char kSettingsSyncLoginUrl[] = "chrome://settings/personal";
// URL that will be opened on when user logs in first time on the device.
const char kGetStartedURL[] =
- "chrome-extension://ngfanffidlhaegpnpjnocdhkijfnlapn/index.html";
+ "chrome-extension://nbaambmfhicobichobkkokacjbaoinda/index.html";
+
+// Path to extracted version of Get Started app.
+const char kGetStartedPath[] = "/usr/share/chromeos-assets/getstarted";
// Used to handle the asynchronous response of deleting a cryptohome directory.
class RemoveAttempt : public CryptohomeLibrary::Delegate {
@@ -505,6 +508,9 @@ void ExistingUserController::OnLoginSuccess(
AppendStartUrlToCmdline();
if (selected_view_index_ + 1 == controllers_.size() && !known_user) {
#if defined(OFFICIAL_BUILD)
+ CommandLine::ForCurrentProcess()->AppendSwitchPath(
+ switches::kLoadExtension,
+ FilePath(kGetStartedPath));
CommandLine::ForCurrentProcess()->AppendArg(kGetStartedURL);
#endif // OFFICIAL_BUILD
// For new user login don't launch browser until we pass image screen.