summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/plugin_globals.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 19:18:45 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 19:18:45 +0000
commit6fc87e0160e55c5ea05ea7f9834a146598685458 (patch)
treec5d2d6987e4ab9fe5710cc965a95b2e993141086 /ppapi/proxy/plugin_globals.cc
parentb31580d250c3813b99fdd88a03e27d07fca9e236 (diff)
downloadchromium_src-6fc87e0160e55c5ea05ea7f9834a146598685458.zip
chromium_src-6fc87e0160e55c5ea05ea7f9834a146598685458.tar.gz
chromium_src-6fc87e0160e55c5ea05ea7f9834a146598685458.tar.bz2
Hook up the PPB_Flash.PreloadFontWin function to our font loading infrastructure.
TEST=manual Review URL: http://codereview.chromium.org/8979002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/plugin_globals.cc')
-rw-r--r--ppapi/proxy/plugin_globals.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/ppapi/proxy/plugin_globals.cc b/ppapi/proxy/plugin_globals.cc
index 6fad009..e5acc4c0 100644
--- a/ppapi/proxy/plugin_globals.cc
+++ b/ppapi/proxy/plugin_globals.cc
@@ -11,7 +11,9 @@ namespace proxy {
PluginGlobals* PluginGlobals::plugin_globals_ = NULL;
-PluginGlobals::PluginGlobals() : ppapi::PpapiGlobals() {
+PluginGlobals::PluginGlobals()
+ : ppapi::PpapiGlobals(),
+ plugin_proxy_delegate_(NULL) {
DCHECK(!plugin_globals_);
plugin_globals_ = this;
}