Chromium Code Reviews| Index: chrome/browser/ui/webui/app_launcher_page_ui.cc |
| diff --git a/chrome/browser/ui/webui/app_launcher_page_ui.cc b/chrome/browser/ui/webui/app_launcher_page_ui.cc |
| index aeee5b0fed0648bb85356fd3bdbccde27188158d..8c054bc2c9d9882acc7ac89f67a32e32e4982901 100644 |
| --- a/chrome/browser/ui/webui/app_launcher_page_ui.cc |
| +++ b/chrome/browser/ui/webui/app_launcher_page_ui.cc |
| @@ -12,6 +12,7 @@ |
| #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" |
| @@ -92,7 +93,8 @@ std::string AppLauncherPageUI::HTMLSource::GetSource() { |
| 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)); |
| @@ -101,6 +103,10 @@ void AppLauncherPageUI::HTMLSource::StartDataRequest( |
| 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 build
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 thi
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)); |