diff options
Diffstat (limited to 'chrome/browser/ui/webui')
10 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index f1092af..5fe11af 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -699,7 +699,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { - return Singleton<ChromeWebUIControllerFactory>::get(); + return base::Singleton<ChromeWebUIControllerFactory>::get(); } ChromeWebUIControllerFactory::ChromeWebUIControllerFactory() { diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h index 5db4e6e..909a80c 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.h @@ -45,7 +45,7 @@ class ChromeWebUIControllerFactory : public content::WebUIControllerFactory { ~ChromeWebUIControllerFactory() override; private: - friend struct DefaultSingletonTraits<ChromeWebUIControllerFactory>; + friend struct base::DefaultSingletonTraits<ChromeWebUIControllerFactory>; // Gets the data for the favicon for a WebUI page. Returns NULL if the WebUI // does not have a favicon. diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc index af11875..3cca922 100644 --- a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc @@ -42,7 +42,7 @@ MachineStatisticsInitializer::MachineStatisticsInitializer() { // static MachineStatisticsInitializer* MachineStatisticsInitializer::GetInstance() { - return Singleton<MachineStatisticsInitializer>::get(); + return base::Singleton<MachineStatisticsInitializer>::get(); } void VerifyOnlyUILanguages(const base::ListValue& list) { diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc index 8aa86f3..b3eb49c19 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc @@ -35,7 +35,7 @@ class MobileSetupDialogDelegate : public WebDialogDelegate { void ShowDialog(const std::string& service_path); protected: - friend struct DefaultSingletonTraits<MobileSetupDialogDelegate>; + friend struct base::DefaultSingletonTraits<MobileSetupDialogDelegate>; MobileSetupDialogDelegate(); ~MobileSetupDialogDelegate() override; @@ -71,7 +71,7 @@ void MobileSetupDialog::Show(const std::string& service_path) { // static MobileSetupDialogDelegate* MobileSetupDialogDelegate::GetInstance() { DCHECK_CURRENTLY_ON(BrowserThread::UI); - return Singleton<MobileSetupDialogDelegate>::get(); + return base::Singleton<MobileSetupDialogDelegate>::get(); } MobileSetupDialogDelegate::MobileSetupDialogDelegate() : dialog_window_(NULL) { diff --git a/chrome/browser/ui/webui/ntp/app_resource_cache_factory.cc b/chrome/browser/ui/webui/ntp/app_resource_cache_factory.cc index ebc41d8..d9baa7c 100644 --- a/chrome/browser/ui/webui/ntp/app_resource_cache_factory.cc +++ b/chrome/browser/ui/webui/ntp/app_resource_cache_factory.cc @@ -18,7 +18,7 @@ NTPResourceCache* AppResourceCacheFactory::GetForProfile(Profile* profile) { // static AppResourceCacheFactory* AppResourceCacheFactory::GetInstance() { - return Singleton<AppResourceCacheFactory>::get(); + return base::Singleton<AppResourceCacheFactory>::get(); } AppResourceCacheFactory::AppResourceCacheFactory() diff --git a/chrome/browser/ui/webui/ntp/app_resource_cache_factory.h b/chrome/browser/ui/webui/ntp/app_resource_cache_factory.h index adcbbe1..fc4b5f9 100644 --- a/chrome/browser/ui/webui/ntp/app_resource_cache_factory.h +++ b/chrome/browser/ui/webui/ntp/app_resource_cache_factory.h @@ -21,7 +21,7 @@ class AppResourceCacheFactory : public BrowserContextKeyedServiceFactory { static AppResourceCacheFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<AppResourceCacheFactory>; + friend struct base::DefaultSingletonTraits<AppResourceCacheFactory>; AppResourceCacheFactory(); ~AppResourceCacheFactory() override; diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.cc index e01cf89..50f602b 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.cc @@ -19,7 +19,7 @@ NTPResourceCache* NTPResourceCacheFactory::GetForProfile(Profile* profile) { // static NTPResourceCacheFactory* NTPResourceCacheFactory::GetInstance() { - return Singleton<NTPResourceCacheFactory>::get(); + return base::Singleton<NTPResourceCacheFactory>::get(); } NTPResourceCacheFactory::NTPResourceCacheFactory() diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h b/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h index cd1ebdb..ecb7dc0 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h @@ -21,7 +21,7 @@ class NTPResourceCacheFactory : public BrowserContextKeyedServiceFactory { static NTPResourceCacheFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<NTPResourceCacheFactory>; + friend struct base::DefaultSingletonTraits<NTPResourceCacheFactory>; NTPResourceCacheFactory(); ~NTPResourceCacheFactory() override; diff --git a/chrome/browser/ui/webui/signin/login_ui_service_factory.cc b/chrome/browser/ui/webui/signin/login_ui_service_factory.cc index b23a420..35b275d 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service_factory.cc +++ b/chrome/browser/ui/webui/signin/login_ui_service_factory.cc @@ -28,7 +28,7 @@ LoginUIService* LoginUIServiceFactory::GetForProfile(Profile* profile) { // static LoginUIServiceFactory* LoginUIServiceFactory::GetInstance() { - return Singleton<LoginUIServiceFactory>::get(); + return base::Singleton<LoginUIServiceFactory>::get(); } // static diff --git a/chrome/browser/ui/webui/signin/login_ui_service_factory.h b/chrome/browser/ui/webui/signin/login_ui_service_factory.h index 41230dc..434dbba 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service_factory.h +++ b/chrome/browser/ui/webui/signin/login_ui_service_factory.h @@ -30,7 +30,7 @@ class LoginUIServiceFactory : public BrowserContextKeyedServiceFactory { static base::Closure GetShowLoginPopupCallbackForProfile(Profile* profile); private: - friend struct DefaultSingletonTraits<LoginUIServiceFactory>; + friend struct base::DefaultSingletonTraits<LoginUIServiceFactory>; LoginUIServiceFactory(); ~LoginUIServiceFactory() override; |