| Index: chrome/browser/profiles/off_the_record_profile_impl.h
|
| diff --git a/chrome/browser/profiles/off_the_record_profile_impl.h b/chrome/browser/profiles/off_the_record_profile_impl.h
|
| index 36e8fc8f5eec2448c96cb0c39b0a66c8eb8179a1..a0193cadf70ba02a3c9733425b57c56d6eecc452 100644
|
| --- a/chrome/browser/profiles/off_the_record_profile_impl.h
|
| +++ b/chrome/browser/profiles/off_the_record_profile_impl.h
|
| @@ -78,10 +78,7 @@ class OffTheRecordProfileImpl : public Profile,
|
| #if defined(OS_CHROMEOS)
|
| virtual void SetupChromeOSEnterpriseExtensionObserver() OVERRIDE;
|
| virtual void InitChromeOSPreferences() OVERRIDE;
|
| -#endif // defined(OS_CHROMEOS)
|
| - virtual ChromeURLDataManager* GetChromeURLDataManager() OVERRIDE;
|
|
|
| -#if defined(OS_CHROMEOS)
|
| virtual void ChangeAppLocale(const std::string& locale,
|
| AppLocaleChangedVia) OVERRIDE;
|
| virtual void OnLogin() OVERRIDE;
|
| @@ -118,6 +115,9 @@ class OffTheRecordProfileImpl : public Profile,
|
| FRIEND_TEST_ALL_PREFIXES(OffTheRecordProfileImplTest, GetHostZoomMap);
|
| void InitHostZoomMap();
|
|
|
| + virtual base::Callback<ChromeURLDataManagerBackend*(void)>
|
| + GetChromeURLDataManagerBackendGetter() const OVERRIDE;
|
| +
|
| content::NotificationRegistrar registrar_;
|
|
|
| // The real underlying profile.
|
| @@ -138,8 +138,6 @@ class OffTheRecordProfileImpl : public Profile,
|
|
|
| scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
|
|
|
| - scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
|
| };
|
|
|
|
|