The isSuggestionsPageEnabled flag will be deprecated/be reassigned to...

The isSuggestionsPageEnabled flag will be deprecated/be reassigned to suggestions coming from user history.

BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10827075

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150512 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/ntp4/new_tab.js

@@ -108,7 +108,7 @@ cr.define('ntp', function() {
    */
   function onLoad() {
     sectionsToWaitFor = loadTimeData.getBoolean('showApps') ? 2 : 1;
-    if (loadTimeData.getBoolean('isSuggestionsPageEnabled'))
+    if (loadTimeData.getBoolean('isDiscoveryInNTPEnabled'))
       sectionsToWaitFor++;
     measureNavDots();
 
@@ -140,7 +140,7 @@ cr.define('ntp', function() {
                               false);
     chrome.send('getMostVisited');
 
-    if (loadTimeData.getBoolean('isSuggestionsPageEnabled')) {
+    if (loadTimeData.getBoolean('isDiscoveryInNTPEnabled')) {
       var suggestions_script = document.createElement('script');
       suggestions_script.src = 'suggestions_page.js';
       suggestions_script.onload = function() {

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

@@ -107,7 +107,7 @@ NewTabUI::NewTabUI(content::WebUI* web_ui)
     web_ui->AddMessageHandler(new RecentlyClosedTabsHandler());
     web_ui->AddMessageHandler(new MetricsHandler());
 #if !defined(OS_ANDROID)
-    if (NewTabUI::IsSuggestionsPageEnabled())
+    if (NewTabUI::IsDiscoveryInNTPEnabled())
       web_ui->AddMessageHandler(new SuggestionsHandler());
     // Android doesn't have a sync promo/username on NTP.
     if (GetProfile()->IsSyncAccessible())
@@ -141,8 +141,8 @@ NewTabUI::NewTabUI(content::WebUI* web_ui)
       new NewTabHTMLSource(GetProfile()->GetOriginalProfile());
   // These two resources should be loaded only if suggestions NTP is enabled.
   html_source->AddResource("suggestions_page.css", "text/css",
-      NewTabUI::IsSuggestionsPageEnabled() ? IDR_SUGGESTIONS_PAGE_CSS : 0);
-  if (NewTabUI::IsSuggestionsPageEnabled()) {
+      NewTabUI::IsDiscoveryInNTPEnabled() ? IDR_SUGGESTIONS_PAGE_CSS : 0);
+  if (NewTabUI::IsDiscoveryInNTPEnabled()) {
     html_source->AddResource("suggestions_page.js", "application/javascript",
         IDR_SUGGESTIONS_PAGE_JS);
   }
@@ -269,7 +269,7 @@ void NewTabUI::RegisterUserPrefs(PrefService* prefs) {
   NewTabPageHandler::RegisterUserPrefs(prefs);
 #if !defined(OS_ANDROID)
   AppLauncherHandler::RegisterUserPrefs(prefs);
-  if (NewTabUI::IsSuggestionsPageEnabled())
+  if (NewTabUI::IsDiscoveryInNTPEnabled())
     SuggestionsHandler::RegisterUserPrefs(prefs);
 #endif
   MostVisitedHandler::RegisterUserPrefs(prefs);
@@ -288,9 +288,9 @@ bool NewTabUI::ShouldShowApps() {
 }
 
 // static
-bool NewTabUI::IsSuggestionsPageEnabled() {
+bool NewTabUI::IsDiscoveryInNTPEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableSuggestionsTabPage);
+      switches::kEnableDiscoveryInNewTabPage);
 }
 
 // static

chrome/browser/ui/webui/ntp/new_tab_ui.h

@@ -34,8 +34,8 @@ class NewTabUI : public content::WebUIController,
   // Returns whether or not to show apps pages.
   static bool ShouldShowApps();
 
-  // Returns whether or not the "suggestions links page" is enabled.
-  static bool IsSuggestionsPageEnabled();
+  // Returns whether or not "Discovery" in the NTP is Enabled.
+  static bool IsDiscoveryInNTPEnabled();
 
   // Adds "url", "title", and "direction" keys on incoming dictionary, setting
   // title as the url as a fallback on empty title.

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

@@ -371,8 +371,8 @@ void NTPResourceCache::CreateNewTabHTML() {
       GetUrlWithLang(GURL(extension_urls::GetWebstoreLaunchURL())));
   load_time_data.SetString("appInstallHintText",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_INSTALL_HINT_LABEL));
-  load_time_data.SetBoolean("isSuggestionsPageEnabled",
-      NewTabUI::IsSuggestionsPageEnabled());
+  load_time_data.SetBoolean("isDiscoveryInNTPEnabled",
+      NewTabUI::IsDiscoveryInNTPEnabled());
   load_time_data.SetBoolean("showApps", NewTabUI::ShouldShowApps());
   load_time_data.SetString("collapseSessionMenuItemText",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_OTHER_SESSIONS_COLLAPSE_SESSION));