Revert 33527 - Put "make this my home page" link into the tip section....

chrome/browser/dom_ui/ntp_resource_cache.cc

 // Copyright (c) 2009 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 "app/animation.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
@@ skipping 125 matching lines @@
 
 }  // namespace
 
 NTPResourceCache::NTPResourceCache(Profile* profile) : profile_(profile) {
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
 
   // Watch for pref changes that cause us to need to invalidate the HTML cache.
   PrefService* pref_service = profile_->GetPrefs();
   pref_service->AddPrefObserver(prefs::kShowBookmarkBar, this);
+  pref_service->AddPrefObserver(prefs::kHomePageIsNewTabPage, this);
   pref_service->AddPrefObserver(prefs::kNTPShownSections, this);
 
   // Watch for pref changes that cause us to need to invalidate the CSS cache.
   pref_service->AddPrefObserver(prefs::kNTPPromoLineRemaining, this);
 }
 
 NTPResourceCache::~NTPResourceCache() {
   PrefService* pref_service = profile_->GetPrefs();
   pref_service->RemovePrefObserver(prefs::kShowBookmarkBar, this);
+  pref_service->RemovePrefObserver(prefs::kHomePageIsNewTabPage, this);
   pref_service->RemovePrefObserver(prefs::kNTPShownSections, this);
 
   pref_service->RemovePrefObserver(prefs::kNTPPromoLineRemaining, this);
 }
 
 RefCountedBytes* NTPResourceCache::GetNewTabHTML(bool is_off_the_record) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   if (is_off_the_record) {
     if (!new_tab_incognito_html_.get())
       CreateNewTabIncognitoHTML();
@@ skipping 185 matching lines @@
           l10n_util::GetString(IDS_PRODUCT_NAME), extensionLink));
   localized_strings.SetString(L"extensionslink", extensionLink);
 
   // Don't initiate the sync related message passing with the page if the sync
   // code is not present.
   if (profile_->GetProfileSyncService())
     localized_strings.SetString(L"syncispresent", "true");
   else
     localized_strings.SetString(L"syncispresent", "false");
 
+  if (!profile_->GetPrefs()->GetBoolean(prefs::kHomePageIsNewTabPage))
+    localized_strings.SetString(L"showsetashomepage", "true");
+
   ChromeURLDataManager::DataSource::SetFontAndTextDirection(&localized_strings);
 
   // Control fade and resize animations.
   std::string anim =
       Animation::ShouldRenderRichAnimation() ? "true" : "false";
   localized_strings.SetString(L"anim", anim);
 
   // Pass the shown_sections pref early so that we can prevent flicker.
   const int shown_sections = profile_->GetPrefs()->GetInteger(
       prefs::kNTPShownSections);
@@ skipping 171 matching lines @@
   // Create the string from our template and the replacements.
   const std::string css_string = ReplaceStringPlaceholders(
       new_tab_theme_css, subst, NULL);
   std::string full_css = ReplaceStringPlaceholders(css_string, subst2, NULL);
 
   new_tab_css_ = new RefCountedBytes;
   new_tab_css_->data.resize(full_css.size());
   std::copy(full_css.begin(), full_css.end(),
             new_tab_css_->data.begin());
 }