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

Unified Diff: chrome/browser/toolbar_model.cc

Issue 1569011: Make the browser survive massive data: URIs, via various techniques:... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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
« no previous file with comments | « chrome/browser/tab_contents/navigation_entry.cc ('k') | chrome/common/chrome_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/toolbar_model.cc
===================================================================
--- chrome/browser/toolbar_model.cc (revision 43077)
+++ chrome/browser/toolbar_model.cc (working copy)
@@ -13,6 +13,7 @@
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/common/chrome_constants.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "grit/generated_resources.h"
@@ -45,6 +46,13 @@
url = entry->virtual_url();
}
}
+ if (url.spec().length() > chrome::kMaxURLDisplayChars) {
+ if (url.IsStandard()) {
+ url = url.GetOrigin();
+ } else {
+ url = GURL(url.scheme() + ":");
+ }
+ }
return net::FormatUrl(url, languages, true, UnescapeRule::NORMAL, NULL, NULL,
NULL);
}
« no previous file with comments | « chrome/browser/tab_contents/navigation_entry.cc ('k') | chrome/common/chrome_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698