Add int params to URLDataSource::StartDataRequest().

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 "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 
 #include <set>
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/metrics_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/ntp_resource_cache.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
 #include "chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/url_data_source.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 "ui/base/l10n/l10n_util.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
@@ skipping 272 matching lines @@
 NewTabUI::NewTabHTMLSource::NewTabHTMLSource(Profile* profile)
     : profile_(profile) {
 }
 
 std::string NewTabUI::NewTabHTMLSource::GetSource() const {
   return chrome::kChromeUINewTabHost;
 }
 
 void NewTabUI::NewTabHTMLSource::StartDataRequest(
     const std::string& path,
-    bool is_incognito,
+    int render_process_id,
+    int render_view_id,
     const content::URLDataSource::GotDataCallback& callback) {
   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<base::RefCountedStaticMemory> resource_bytes(
         it->second.second ?
             ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
                 it->second.second) :
             new base::RefCountedStaticMemory);
     callback.Run(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.
 
     // TODO(dtrainor): Can remove this #if check once we update the
     // accessibility script to no longer try to access urls like
     // '?2314124523523'.
     // See http://crbug.com/150252.
 #if !defined(OS_ANDROID)
     NOTREACHED() << path << " should not have been requested on the NTP";
 #endif
+    callback.Run(NULL);
     return;
   }
 
+  content::RenderProcessHost* render_host =
+      content::RenderProcessHost::FromID(render_process_id);
+  bool is_incognito = render_host->GetBrowserContext()->IsOffTheRecord();
   scoped_refptr<base::RefCountedMemory> html_bytes(
       NTPResourceCacheFactory::GetForProfile(profile_)->
       GetNewTabHTML(is_incognito));
 
   callback.Run(html_bytes);
 }
 
 std::string NewTabUI::NewTabHTMLSource::GetMimeType(const std::string& resource)
     const {
   std::map<std::string, std::pair<std::string, int> >::const_iterator it =
@@ skipping 14 matching lines @@
 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);
 }
 
 NewTabUI::NewTabHTMLSource::~NewTabHTMLSource() {}