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

Unified Diff: chrome/browser/ui/views/chrome_views_delegate.cc

Issue 2748363002: Fix UBSan testing builds (Closed)
Patch Set: Created 3 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/ui/views/chrome_views_delegate.h ('k') | chrome/browser/ui/views/harmony/layout_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/chrome_views_delegate.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index 20793d9fc5e0ff082b4013cfcd6fbb4a45a30e1a..e85e2805f89f3e31e89208b9324919bf694c9984 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -264,6 +264,13 @@ int ChromeViewsDelegate::GetDistanceMetric(views::DistanceMetric metric) const {
}
int ChromeViewsDelegate::GetDefaultDistanceMetric(
+ views::DistanceMetric metric) {
+ return views_delegate
+ ? views_delegate->InternalGetDefaultDistanceMetric(metric)
+ : views::ViewsDelegate::GetInstance()->GetDistanceMetric(metric);
+}
+
+int ChromeViewsDelegate::InternalGetDefaultDistanceMetric(
views::DistanceMetric metric) const {
return views::ViewsDelegate::GetDistanceMetric(metric);
}
« no previous file with comments | « chrome/browser/ui/views/chrome_views_delegate.h ('k') | chrome/browser/ui/views/harmony/layout_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698