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

Unified Diff: chrome/common/chrome_content_client.cc

Issue 747923004: webui: minimize webui flicker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 years, 1 month 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/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index d8da8c7381f9cee15ce6c3dd93fa9fd1b1a59b17..5e0f0fdfa91492346252156390e7869239b84e79 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -34,6 +34,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/webui/web_ui_util.h"
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
@@ -512,6 +513,14 @@ base::RefCountedStaticMemory* ChromeContentClient::GetDataResourceBytes(
return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
}
+content::WebUITextStyles ChromeContentClient::GetWebUITextStyles() const {
+ content::WebUITextStyles text_styles;
+ text_styles.font_family = webui::GetFontFamily();
+ text_styles.font_size = webui::GetFontSize();
+ text_styles.text_direction = webui::GetTextDirection();
+ return text_styles;
+}
+
gfx::Image& ChromeContentClient::GetNativeImageNamed(int resource_id) const {
return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
}

Powered by Google App Engine
This is Rietveld 408576698