Revert 64246 (reviewer's veto) - Use special text for Guest Session instead o...

chrome/browser/dom_ui/ntp_resource_cache.cc

 // Copyright (c) 2010 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/dom_ui/ntp_resource_cache.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
-#include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/ref_counted_memory.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/shown_sections_handler.h"
@@ skipping 165 matching lines @@
     }
   } else {
     NOTREACHED();
   }
 }
 
 void NTPResourceCache::CreateNewTabIncognitoHTML() {
   DictionaryValue localized_strings;
   localized_strings.SetString("title",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE));
-  int new_tab_message_ids = IDS_NEW_TAB_OTR_MESSAGE;
-  int new_tab_html_idr = IDR_INCOGNITO_TAB_HTML;
-#if defined(OS_CHROMEOS)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
-    new_tab_message_ids = IDS_NEW_TAB_GUEST_SESSION_MESSAGE;
-    new_tab_html_idr = IDR_GUEST_SESSION_TAB_HTML;
-  }
-#endif
   localized_strings.SetString("content",
-      l10n_util::GetStringFUTF16(new_tab_message_ids,
+      l10n_util::GetStringFUTF16(IDS_NEW_TAB_OTR_MESSAGE,
                                  GetUrlWithLang(GURL(kLearnMoreIncognitoUrl))));
   localized_strings.SetString("extensionsmessage",
       l10n_util::GetStringFUTF16(IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE,
                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
                                  ASCIIToUTF16(chrome::kChromeUIExtensionsURL)));
   bool bookmark_bar_attached = profile_->GetPrefs()->GetBoolean(
       prefs::kShowBookmarkBar);
   localized_strings.SetString("bookmarkbarattached",
       bookmark_bar_attached ? "true" : "false");
 
   ChromeURLDataManager::DataSource::SetFontAndTextDirection(&localized_strings);
 
   static const base::StringPiece incognito_tab_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          new_tab_html_idr));
+          IDR_INCOGNITO_TAB_HTML));
 
   std::string full_html = jstemplate_builder::GetI18nTemplateHtml(
       incognito_tab_html, &localized_strings);
 
   new_tab_incognito_html_ = new RefCountedBytes;
   new_tab_incognito_html_->data.resize(full_html.size());
   std::copy(full_html.begin(), full_html.end(),
             new_tab_incognito_html_->data.begin());
 }
 
@@ skipping 277 matching lines @@
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
   css_string = ReplaceStringPlaceholders(css_string, subst2, NULL);
   css_string = ReplaceStringPlaceholders(css_string, subst3, NULL);
 
   new_tab_css_ = new RefCountedBytes;
   new_tab_css_->data.resize(css_string.size());
   std::copy(css_string.begin(), css_string.end(),
             new_tab_css_->data.begin());
 }