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

Unified Diff: chrome/browser/ui/webui/theme_source.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/theme_source.cc
diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc
index 26f76db793d0250e90d2ded6b059773576856a7f..0a87c0809fe96a08873cbdcb5cb3cd9bc9dec38a 100644
--- a/chrome/browser/ui/webui/theme_source.cc
+++ b/chrome/browser/ui/webui/theme_source.cc
@@ -56,7 +56,8 @@ std::string ThemeSource::GetSource() const {
void ThemeSource::StartDataRequest(
const std::string& path,
- bool is_incognito,
+ int render_process_id,
+ int render_view_id,
const content::URLDataSource::GotDataCallback& callback) {
// Default scale factor if not specified.
ui::ScaleFactor scale_factor;
@@ -68,8 +69,6 @@ void ThemeSource::StartDataRequest(
if (uncached_path == kNewTabCSSPath ||
uncached_path == kNewIncognitoTabCSSPath) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- DCHECK((uncached_path == kNewTabCSSPath && !is_incognito) ||
- (uncached_path == kNewIncognitoTabCSSPath && is_incognito));
palmer 2013/04/22 19:38:37 Are we sure it's safe to remove this DCHECK?
Jered 2013/04/22 23:02:58 Yes. The owners agreed this was ok in https://code
callback.Run(css_bytes_);
return;

Powered by Google App Engine
This is Rietveld 408576698