Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6903)

Unified Diff: chrome/browser/ui/webui/app_launcher_page_ui.cc

Issue 13375003: Fixing iframe jank in the local omnibox popup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebuilding on 14039004. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 1a18e843b080d6f1b0ef26daaaac8df42f6e3563..b02d6fe1cac991369f2e8ae7120a87f79b8f6fdf 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() const {
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,9 @@ 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);
+ bool is_incognito = render_host->GetBrowserContext()->IsOffTheRecord();
scoped_refptr<base::RefCountedMemory> html_bytes(
resource->GetNewTabHTML(is_incognito));

Powered by Google App Engine
This is Rietveld 408576698