Added new adaptive "Suggest" tab on the New Tab Page, behing the flag, for the experiments.

chrome/browser/ui/webui/ntp/new_tab_ui.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 "build/build_config.h"
 
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 
 #include <set>
 
@@ skipping 20 matching lines @@
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/browser/ui/webui/ntp/favicon_webui_handler.h"
 #include "chrome/browser/ui/webui/ntp/foreign_session_handler.h"
 #include "chrome/browser/ui/webui/ntp/most_visited_handler.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h"
 #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
 #include "chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.h"
+#include "chrome/browser/ui/webui/ntp/suggestions_page_handler.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
+#include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 using content::UserMetricsAction;
 using content::WebContents;
 using content::WebUIController;
 
 namespace {
@@ skipping 38 matching lines @@
   web_ui->OverrideTitle(l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE));
 
   // We count all link clicks as AUTO_BOOKMARK, so that site can be ranked more
   // highly. Note this means we're including clicks on not only most visited
   // thumbnails, but also clicks on recently bookmarked.
   web_ui->SetLinkTransitionType(content::PAGE_TRANSITION_AUTO_BOOKMARK);
 
   if (!GetProfile()->IsOffTheRecord()) {
     web_ui->AddMessageHandler(new browser_sync::ForeignSessionHandler());
     web_ui->AddMessageHandler(new MostVisitedHandler());
+    if (NewTabUI::IsSuggestionsPageEnabled())
+      web_ui->AddMessageHandler(new SuggestionsHandler());
     web_ui->AddMessageHandler(new RecentlyClosedTabsHandler());
     web_ui->AddMessageHandler(new MetricsHandler());
     if (GetProfile()->IsSyncAccessible())
       web_ui->AddMessageHandler(new NewTabPageSyncHandler());
     ExtensionService* service = GetProfile()->GetExtensionService();
     // We might not have an ExtensionService (on ChromeOS when not logged in
     // for example).
     if (service)
       web_ui->AddMessageHandler(new AppLauncherHandler(service));
 
     web_ui->AddMessageHandler(new NewTabPageHandler());
     web_ui->AddMessageHandler(new FaviconWebUIHandler());
   }
 
   if (NTPLoginHandler::ShouldShow(GetProfile()))
     web_ui->AddMessageHandler(new NTPLoginHandler());
 
   // Initializing the CSS and HTML can require some CPU, so do it after
   // we've hooked up the most visited handler.  This allows the DB query
   // for the new tab thumbs to happen earlier.
   InitializeCSSCaches();
   NewTabHTMLSource* html_source =
       new NewTabHTMLSource(GetProfile()->GetOriginalProfile());
   GetProfile()->GetChromeURLDataManager()->AddDataSource(html_source);
+  // 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()) {
+    html_source->AddResource("suggestions_page.js", "text/javascript",

[Dan Beam, 2012/02/28 20:14:24]

nit: should this be application/javascript?  if you're just following precedent,
that's fine, but text/javascript is the old mime type for .js files.

[GeorgeY, 2012/02/28 21:17:42]

sure

+        IDR_SUGGESTIONS_PAGE_JS);
+  }
 
   // Listen for theme installation.
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(GetProfile())));
 }
 
 NewTabUI::~NewTabUI() {
   g_live_new_tabs.Pointer()->erase(this);
 }
@@ skipping 75 matching lines @@
   Profile* profile = GetProfile();
   ThemeSource* theme = new ThemeSource(profile);
   profile->GetChromeURLDataManager()->AddDataSource(theme);
 }
 
 // static
 void NewTabUI::RegisterUserPrefs(PrefService* prefs) {
   NewTabPageHandler::RegisterUserPrefs(prefs);
   AppLauncherHandler::RegisterUserPrefs(prefs);
   MostVisitedHandler::RegisterUserPrefs(prefs);
+  if (NewTabUI::IsSuggestionsPageEnabled())
+    SuggestionsHandler::RegisterUserPrefs(prefs);
 }
 
 // static
 void NewTabUI::SetupFieldTrials() {
   scoped_refptr<base::FieldTrial> trial(
       new base::FieldTrial(kWebStoreLinkExperiment, 1000, "Disabled",
                            2012, 6, 1));
 
   // Try to give the user a consistent experience, if possible.
   if (base::FieldTrialList::IsOneTimeRandomizationEnabled())
@@ skipping 13 matching lines @@
 }
 
 // static
 bool NewTabUI::ShouldShowAppInstallHint() {
   const CommandLine* cli = CommandLine::ForCurrentProcess();
   return cli->HasSwitch(switches::kNtpAppInstallHint) ||
       WebStoreLinkExperimentGroupIs(g_hint_group);
 }
 
 // static
+bool NewTabUI::IsSuggestionsPageEnabled() {
+  return CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableSuggestionsTabPage);
+}
+
+// static
 void NewTabUI::SetURLTitleAndDirection(DictionaryValue* dictionary,
                                        const string16& title,
                                        const GURL& gurl) {
   dictionary->SetString("url", gurl.spec());
 
   bool using_url_as_the_title = false;
   string16 title_to_set(title);
   if (title_to_set.empty()) {
     using_url_as_the_title = true;
     title_to_set = UTF8ToUTF16(gurl.spec());
@@ skipping 39 matching lines @@
 NewTabUI::NewTabHTMLSource::NewTabHTMLSource(Profile* profile)
     : DataSource(chrome::kChromeUINewTabHost, MessageLoop::current()),
       profile_(profile) {
 }
 
 void NewTabUI::NewTabHTMLSource::StartDataRequest(const std::string& path,
                                                   bool is_incognito,
                                                   int request_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+  std::map<std::string, std::pair<std::string, int> >::iterator it =
+    resource_map_.find(path);
+  if (it != resource_map_.end()) {
+    scoped_refptr<RefCountedStaticMemory> resource_bytes(

[Dan Beam, 2012/02/28 20:14:24]

nit: indent is weird

[GeorgeY, 2012/02/28 21:17:42]

Four spaces - what is the problem?

[Dan Beam, 2012/02/28 22:30:12]

It's fine.

+        it->second.second ?
+            ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
+                it->second.second) :
+            new RefCountedStaticMemory);
+    SendResponse(request_id, resource_bytes);
+    return;
+  }
+
   if (!path.empty() && path[0] != '#') {
     // A path under new-tab was requested; it's likely a bad relative
     // URL from the new tab page, but in any case it's an error.
     NOTREACHED() << path << " should not have been requested on the NTP";
     return;
   }
 
   scoped_refptr<RefCountedMemory> html_bytes(
       NTPResourceCacheFactory::GetForProfile(profile_)->
       GetNewTabHTML(is_incognito));
 
   SendResponse(request_id, html_bytes);
 }
 
-std::string NewTabUI::NewTabHTMLSource::GetMimeType(const std::string&) const {
+std::string NewTabUI::NewTabHTMLSource::GetMimeType(const std::string& s)

[Dan Beam, 2012/02/28 20:14:24]

can you rename |s| to something more descriptive?

[GeorgeY, 2012/02/28 21:17:42]

Done.

+    const {
+  std::map<std::string, std::pair<std::string, int> >::const_iterator it =
+      resource_map_.find(s);
+  if (it != resource_map_.end())
+    return it->second.first;
   return "text/html";
 }
 
 bool NewTabUI::NewTabHTMLSource::ShouldReplaceExistingSource() const {
   return false;
 }
+
+void NewTabUI::NewTabHTMLSource::AddResource(const char* resource,
+                                             const char* mime_type,
+                                             int resource_id) {
+  DCHECK(resource);
+  DCHECK(mime_type);
+  resource_map_[std::string(resource)] =
+      std::make_pair(std::string(mime_type), resource_id);
+}