Add int params to URLDataSource::StartDataRequest().

chrome/browser/ui/webui/app_launcher_page_ui.cc

 // Copyright (c) 2013 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/app_launcher_page_ui.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/browser/ui/webui/ntp/app_resource_cache_factory.h"
 #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(ENABLE_THEMES)
 #include "chrome/browser/ui/webui/theme_handler.h"
 #endif
 
@@ skipping 60 matching lines @@
 AppLauncherPageUI::HTMLSource::HTMLSource(Profile* profile)
     : profile_(profile) {
 }
 
 std::string AppLauncherPageUI::HTMLSource::GetSource() {
   return chrome::kChromeUIAppLauncherPageHost;
 }
 
 void AppLauncherPageUI::HTMLSource::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));
 
   NTPResourceCache* resource = AppResourceCacheFactory::GetForProfile(profile_);
   resource->set_should_show_most_visited_page(false);
   resource->set_should_show_other_devices_menu(false);
   resource->set_should_show_recently_closed_menu(false);
 
+  content::RenderProcessHost* render_host =
+      content::RenderProcessHost::FromID(render_process_id);
+  DCHECK(render_host != NULL);

[jam, 2013/04/17 00:45:09]

nit: remove this, it's redundant. in release builds, it does nothing. in debug,
a crash in the next line is just as strong of a signal to the developer

[Jered, 2013/04/17 01:03:08]

Done.

+  const bool is_incognito = render_host->GetBrowserContext()->IsOffTheRecord();

[jam, 2013/04/17 00:45:09]

personally, i think the const is too much. but this isn't in the style guide, so
up to you

[Jered, 2013/04/17 01:03:08]

Removed. I have no strong preference, just habit.

   scoped_refptr<base::RefCountedMemory> html_bytes(
       resource->GetNewTabHTML(is_incognito));
 
   callback.Run(html_bytes);
 }
 
 std::string AppLauncherPageUI::HTMLSource::GetMimeType(
     const std::string& resource) const {
   return "text/html";
 }
 
 bool AppLauncherPageUI::HTMLSource::ShouldReplaceExistingSource() const {
   return false;
 }
 
 bool AppLauncherPageUI::HTMLSource::ShouldAddContentSecurityPolicy() const {
   return false;
 }
 
 AppLauncherPageUI::HTMLSource::~HTMLSource() {}