Merge 85877 - Replace GetStarted component extension with URL

BUG=chromium-os:14485
TEST=manual

Review URL: http://codereview.chromium.org/6930033

TBR=dpolukhin@chromium.org
Review URL: http://codereview.chromium.org/7047002

git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@85918 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 28 deletions

diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index ecafe8e..cfaa586 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -121,7 +121,6 @@
       </if>
       <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
         <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json" type="BINDATA" />
-        <include name="IDR_GETSTARTED_MANIFEST" file="resources\getstarted\manifest.json" type="BINDATA" />
       </if>
     </includes>
   </release>
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 5ef8b56..07e7a31 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -6,6 +6,8 @@
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
+#include "base/stringprintf.h"
+#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
@@ -43,8 +45,8 @@ namespace {
 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://cbmhffdpiobpchciemffincgahkkljig/index.html";
+const char kGetStartedURLPattern[] =
+    "http://services.google.com/chromeos/gettingstarted/index-%s.html";
 
 // URL for account creation.
 const char kCreateAccountURL[] =
@@ -333,9 +335,12 @@ void ExistingUserController::OnLoginSuccess(
 void ExistingUserController::OnProfilePrepared(Profile* profile) {
   // TODO(nkostylev): May add login UI implementation callback call.
   if (!ready_for_browser_launch_) {
-#if defined(OFFICIAL_BUILD)
-    CommandLine::ForCurrentProcess()->AppendArg(kGetStartedURL);
-#endif  // OFFICIAL_BUILD
+    PrefService* prefs = g_browser_process->local_state();
+    const std::string current_locale =
+        StringToLowerASCII(prefs->GetString(prefs::kApplicationLocale));
+    std::string start_url =
+      base::StringPrintf(kGetStartedURLPattern, current_locale.c_str());
+    CommandLine::ForCurrentProcess()->AppendArg(start_url);
 
     ServicesCustomizationDocument* customization =
       ServicesCustomizationDocument::GetInstance();
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 6e5530e..9f507eb 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -503,10 +503,6 @@ void ProfileImpl::RegisterComponentExtensions() {
           FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp"),
           IDR_HELP_MANIFEST));
     }
-
-    component_extensions.push_back(std::make_pair(
-        FILE_PATH_LITERAL("/usr/share/chromeos-assets/getstarted"),
-        IDR_GETSTARTED_MANIFEST));
 #endif
   }
 #endif
diff --git a/chrome/browser/resources/getstarted/manifest.json b/chrome/browser/resources/getstarted/manifest.json
deleted file mode 100644
index 3b361f9..0000000
--- a/chrome/browser/resources/getstarted/manifest.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "Get Started",
-  "description": "Get Started",
-  "version": "1.0.26",
-  "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAuFUzjec2nXa5iFEycabbHL9h4ga7hsRGT0LVUlhhfm0tH8OTGzQtzcZG+Skk/stWOHNcd03lSPrPwCEtjJ9pDjtM2I0bYwXrcnVSBx+h9JXnDIJ0zsdVQsjOIknSFunxcedfG0v+yfGAfgamLSpAhAg8Le2pniqDJ24u3nIPjQIDAQAB",
-  "app": {
-    "launch": {
-      "local_path": "index.html"
-    }
-  },
-  "icons": {
-    "16": "images/16x16.png",
-    "128": "images/128x128.png"
-  },
-  "permissions": [
-    "tabs"
-  ]
-}
\ No newline at end of file