| Index: chrome/browser/dom_ui/html_dialog_ui.cc
|
| diff --git a/chrome/browser/dom_ui/html_dialog_ui.cc b/chrome/browser/dom_ui/html_dialog_ui.cc
|
| index ee9ce3442c1b2f61512ef8fa14dbc2c6bbae4d7e..fbea1f63e0c55070704b79d5422d58f3771c8ad8 100644
|
| --- a/chrome/browser/dom_ui/html_dialog_ui.cc
|
| +++ b/chrome/browser/dom_ui/html_dialog_ui.cc
|
| @@ -5,13 +5,16 @@
|
| #include "chrome/browser/dom_ui/html_dialog_ui.h"
|
|
|
| #include "base/callback.h"
|
| -#include "base/singleton.h"
|
| +#include "base/lazy_instance.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/dom_ui/dom_ui_util.h"
|
| #include "chrome/browser/tab_contents/tab_contents.h"
|
| #include "chrome/browser/renderer_host/render_view_host.h"
|
| #include "chrome/common/bindings_policy.h"
|
|
|
| +static base::LazyInstance<PropertyAccessor<HtmlDialogUIDelegate*> >
|
| + g_html_dialog_ui_property_accessor(base::LINKER_INITIALIZED);
|
| +
|
| HtmlDialogUI::HtmlDialogUI(TabContents* tab_contents) : DOMUI(tab_contents) {
|
| }
|
|
|
| @@ -28,7 +31,7 @@ HtmlDialogUI::~HtmlDialogUI() {
|
|
|
| // static
|
| PropertyAccessor<HtmlDialogUIDelegate*>& HtmlDialogUI::GetPropertyAccessor() {
|
| - return *Singleton< PropertyAccessor<HtmlDialogUIDelegate*> >::get();
|
| + return g_html_dialog_ui_property_accessor.Get();
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|