Use HelpApp in guest mode

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 124 matching lines @@
 using base::TimeDelta;
 
 ///////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
 // The URL to be loaded to display Help.
 #if defined(OS_CHROMEOS)
 const char kHelpContentUrl[] =
     "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html";
-const char kHelpContentOnlineUrl[] =
-    "http://www.google.com/support/chromeos/";
 #else
 const char kHelpContentUrl[] =
     "http://www.google.com/support/chrome/";
 #endif
 
 // The URL to be opened when the Help link on the Autofill dialog is clicked.
 const char kAutofillHelpUrl[] =
 #if defined(OS_CHROMEOS)
     "http://www.google.com/support/chromeos/bin/answer.py?answer=142893";
 #else
@@ skipping 1698 matching lines @@
 #endif
 }
 
 void Browser::OpenUpdateChromeDialog() {
   UserMetrics::RecordAction(UserMetricsAction("UpdateChrome"), profile_);
   window_->ShowUpdateChromeDialog();
 }
 
 void Browser::OpenHelpTab() {
   GURL help_url(kHelpContentUrl);
-#if defined(OS_CHROMEOS)
-  // TODO(nkostylev): Always redirect to HelpApp http://crosbug.com/6923
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession))
-    help_url = GURL(kHelpContentOnlineUrl);
-#endif
   GURL localized_help_url = google_util::AppendGoogleLocaleParam(help_url);
   AddSelectedTabWithURL(localized_help_url, PageTransition::AUTO_BOOKMARK);
 }
 
 void Browser::OpenThemeGalleryTabAndActivate() {
   AddSelectedTabWithURL(GURL(l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL)),
                         PageTransition::LINK);
 }
 
 void Browser::OpenPrivacyDashboardTabAndActivate() {
@@ skipping 2382 matching lines @@
     // The page transition below is only for the purpose of inserting the tab.
     browser->AddTab(view_source_contents, PageTransition::LINK);
   }
 
   if (profile_->HasSessionService()) {
     SessionService* session_service = profile_->GetSessionService();
     if (session_service)
       session_service->TabRestored(&view_source_contents->controller(), false);
   }
 }