| Index: chrome/browser/dom_ui/constrained_html_ui.cc
|
| diff --git a/chrome/browser/dom_ui/constrained_html_ui.cc b/chrome/browser/dom_ui/constrained_html_ui.cc
|
| index d15644cc101962f82dd6faed3e9b5d8b9699b23c..3d90fafa43ceca9d71b39a798657a4b3cfbf43f4 100644
|
| --- a/chrome/browser/dom_ui/constrained_html_ui.cc
|
| +++ b/chrome/browser/dom_ui/constrained_html_ui.cc
|
| @@ -4,12 +4,15 @@
|
|
|
| #include "chrome/browser/dom_ui/constrained_html_ui.h"
|
|
|
| -#include "base/singleton.h"
|
| +#include "base/lazy_instance.h"
|
| #include "chrome/browser/dom_ui/dom_ui_util.h"
|
| #include "chrome/browser/dom_ui/html_dialog_ui.h"
|
| #include "chrome/browser/renderer_host/render_view_host.h"
|
| #include "chrome/common/bindings_policy.h"
|
|
|
| +static base::LazyInstance<PropertyAccessor<ConstrainedHtmlUIDelegate*> >
|
| + g_constrained_html_ui_property_accessor(base::LINKER_INITIALIZED);
|
| +
|
| ConstrainedHtmlUI::ConstrainedHtmlUI(TabContents* contents)
|
| : DOMUI(contents) {
|
| }
|
| @@ -50,5 +53,5 @@ ConstrainedHtmlUIDelegate*
|
| // static
|
| PropertyAccessor<ConstrainedHtmlUIDelegate*>&
|
| ConstrainedHtmlUI::GetPropertyAccessor() {
|
| - return *Singleton<PropertyAccessor<ConstrainedHtmlUIDelegate*> >::get();
|
| + return g_constrained_html_ui_property_accessor.Get();
|
| }
|
|
|