Switch guest profile from forced-incognito to UI mods like ChromeOS.

chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

 // Copyright (c) 2012 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/webui/ntp/ntp_resource_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 278 matching lines @@
   new_tab_css_ = NULL;
 }
 
 void NTPResourceCache::CreateNewTabIncognitoHTML() {
   base::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;
   const char* new_tab_link = kLearnMoreIncognitoUrl;
+
   // TODO(altimofeev): consider implementation without 'if def' usage.
 #if defined(OS_CHROMEOS)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kGuestSession)) {
+  if (profile_->IsGuestSession()) {
     new_tab_message_ids = IDS_NEW_TAB_GUEST_SESSION_MESSAGE;
     new_tab_html_idr = IDR_GUEST_SESSION_TAB_HTML;
     new_tab_link = kLearnMoreGuestSessionUrl;
 
     policy::BrowserPolicyConnectorChromeOS* connector =
         g_browser_process->platform_part()->browser_policy_connector_chromeos();
     std::string enterprise_domain = connector->GetEnterpriseDomain();
     if (!enterprise_domain.empty()) {
       // Device is enterprise enrolled.
       localized_strings.SetString("enterpriseInfoVisible", "true");
       base::string16 enterprise_info = l10n_util::GetStringFUTF16(
           IDS_DEVICE_OWNED_BY_NOTICE,
           base::UTF8ToUTF16(enterprise_domain));
       localized_strings.SetString("enterpriseInfoMessage", enterprise_info);
       localized_strings.SetString("learnMore",
           l10n_util::GetStringUTF16(IDS_LEARN_MORE));
       localized_strings.SetString("enterpriseInfoHintLink",
           GetUrlWithLang(GURL(chrome::kLearnMoreEnterpriseURL)));
     } else {
       localized_strings.SetString("enterpriseInfoVisible", "false");
     }
   }
 #endif
+
   localized_strings.SetString("content",
       l10n_util::GetStringFUTF16(new_tab_message_ids,
                                  GetUrlWithLang(GURL(new_tab_link))));
   localized_strings.SetString("extensionsmessage",
       l10n_util::GetStringFUTF16(
           IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
           base::ASCIIToUTF16(chrome::kChromeUIExtensionsURL)));
   bool bookmark_bar_attached = profile_->GetPrefs()->GetBoolean(
       prefs::kShowBookmarkBar);
@@ skipping 371 matching lines @@
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_NEW_TAB_4_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
   new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }