Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / components / signin / core / browser / signin_manager.h

diff --git a/src/components/signin/core/browser/signin_manager.h b/src/components/signin/core/browser/signin_manager.h
index 275621a..f03beb7 100644 (file)
--- a/src/components/signin/core/browser/signin_manager.h
+++ b/src/components/signin/core/browser/signin_manager.h
@@ -130,10 +130,8 @@ class SigninManager : public SigninManagerBase {
   bool IsSignoutProhibited() const;
 
   // Add or remove observers for the merge session notification.
-  virtual void AddMergeSessionObserver(
-      MergeSessionHelper::Observer* observer);
-  virtual void RemoveMergeSessionObserver(
-      MergeSessionHelper::Observer* observer);
+  void AddMergeSessionObserver(MergeSessionHelper::Observer* observer);
+  void RemoveMergeSessionObserver(MergeSessionHelper::Observer* observer);
 
  protected:
   // Flag saying whether signing out is allowed.
@@ -193,8 +191,6 @@ class SigninManager : public SigninManagerBase {
   // token service so that it does not need to mint new ones.
   std::string temp_refresh_token_;
 
-  base::WeakPtrFactory<SigninManager> weak_pointer_factory_;
-
   // The SigninClient object associated with this object. Must outlive this
   // object.
   SigninClient* client_;
@@ -213,6 +209,8 @@ class SigninManager : public SigninManagerBase {
   // Helper to merge signed in account into the content area.
   scoped_ptr<MergeSessionHelper> merge_session_helper_;
 
+  base::WeakPtrFactory<SigninManager> weak_pointer_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(SigninManager);
 };