Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / profiles / profile.h

diff --git a/src/chrome/browser/profiles/profile.h b/src/chrome/browser/profiles/profile.h
index 1f5b501..eb65083 100644 (file)
--- a/src/chrome/browser/profiles/profile.h
+++ b/src/chrome/browser/profiles/profile.h
@@ -18,7 +18,6 @@
 
 class ChromeAppCacheService;
 class DevToolsNetworkController;
-class ExtensionService;
 class ExtensionSpecialStoragePolicy;
 class FaviconService;
 class HostContentSettingsMap;
@@ -27,7 +26,6 @@ class PrefService;
 class PromoCounter;
 class ProtocolHandlerRegistry;
 class TestingProfile;
-class WebDataService;
 
 namespace android {
 class TabContentsProvider;
@@ -107,7 +105,7 @@ class Profile : public content::BrowserContext {
     CREATE_STATUS_CREATED,
     // Profile is created, extensions and promo resources are initialized.
     CREATE_STATUS_INITIALIZED,
-    // Profile creation (managed-user registration, generally) was canceled
+    // Profile creation (supervised-user registration, generally) was canceled
     // by the user.
     CREATE_STATUS_CANCELED,
     MAX_CREATE_STATUS  // For histogram display.
@@ -202,7 +200,7 @@ class Profile : public content::BrowserContext {
   // profile is not incognito.
   virtual Profile* GetOriginalProfile() = 0;
 
-  // Returns whether the profile is supervised (see ManagedUserService).
+  // Returns whether the profile is supervised (see SupervisedUserService).
   virtual bool IsSupervised() = 0;
 
   // Returns a pointer to the TopSites (thumbnail manager) instance
@@ -212,12 +210,6 @@ class Profile : public content::BrowserContext {
   // Variant of GetTopSites that doesn't force creation.
   virtual history::TopSites* GetTopSitesWithoutCreating() = 0;
 
-  // DEPRECATED. Instead, use ExtensionSystem::extension_service().
-  // Retrieves a pointer to the ExtensionService associated with this
-  // profile. The ExtensionService is created at startup.
-  // TODO(yoz): remove this accessor (bug 104095).
-  virtual ExtensionService* GetExtensionService() = 0;
-
   // Accessor. The instance is created upon first access.
   virtual ExtensionSpecialStoragePolicy*
       GetExtensionSpecialStoragePolicy() = 0;
@@ -291,6 +283,8 @@ class Profile : public content::BrowserContext {
     APP_LOCALE_CHANGED_VIA_REVERT,
     // From login screen.
     APP_LOCALE_CHANGED_VIA_LOGIN,
+    // From login to a public session.
+    APP_LOCALE_CHANGED_VIA_PUBLIC_SESSION_LOGIN,
     // Source unknown.
     APP_LOCALE_CHANGED_VIA_UNKNOWN
   };
@@ -325,12 +319,6 @@ class Profile : public content::BrowserContext {
   virtual void ClearNetworkingHistorySince(base::Time time,
                                            const base::Closure& completion) = 0;
 
-  // Clears browsing data stored in the Domain Reliability Monitor. (See
-  // profile_impl_io_data.h for details.)
-  virtual void ClearDomainReliabilityMonitor(
-      domain_reliability::DomainReliabilityClearMode mode,
-      const base::Closure& competion) = 0;
-
   // Returns the home page for this profile.
   virtual GURL GetHomePage() = 0;