| Index: chrome/browser/chromeos/gdata/operation_runner.h
|
| diff --git a/chrome/browser/chromeos/gdata/gdata_operation_runner.h b/chrome/browser/chromeos/gdata/operation_runner.h
|
| similarity index 71%
|
| rename from chrome/browser/chromeos/gdata/gdata_operation_runner.h
|
| rename to chrome/browser/chromeos/gdata/operation_runner.h
|
| index 044c5641a9c7a38d77f2b7c5a919725fdfee6bed..dfb9eb71c2cdf6fa10fbbd1da53874cbbd909882 100644
|
| --- a/chrome/browser/chromeos/gdata/gdata_operation_runner.h
|
| +++ b/chrome/browser/chromeos/gdata/operation_runner.h
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_OPERATION_RUNNER_H_
|
| -#define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_OPERATION_RUNNER_H_
|
| +#ifndef CHROME_BROWSER_CHROMEOS_GDATA_OPERATION_RUNNER_H_
|
| +#define CHROME_BROWSER_CHROMEOS_GDATA_OPERATION_RUNNER_H_
|
|
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "chrome/browser/chromeos/gdata/gdata_auth_service.h"
|
| +#include "chrome/browser/chromeos/gdata/auth_service.h"
|
| #include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
|
|
|
| class Profile;
|
| @@ -18,17 +18,17 @@ class Profile;
|
| namespace gdata {
|
|
|
| class GDataOperationInterface;
|
| -class GDataOperationRegistry;
|
| +class OperationRegistry;
|
|
|
| // Helper class that runs GDataOperationInterface objects, handling retries and
|
| // authentication.
|
| -class GDataOperationRunner : public GDataAuthService::Observer {
|
| +class OperationRunner : public AuthService::Observer {
|
| public:
|
| - explicit GDataOperationRunner(Profile* profile);
|
| - virtual ~GDataOperationRunner();
|
| + explicit OperationRunner(Profile* profile);
|
| + virtual ~OperationRunner();
|
|
|
| - GDataAuthService* auth_service() { return auth_service_.get(); }
|
| - GDataOperationRegistry* operation_registry() {
|
| + AuthService* auth_service() { return auth_service_.get(); }
|
| + OperationRegistry* operation_registry() {
|
| return operation_registry_.get();
|
| }
|
|
|
| @@ -61,21 +61,21 @@ class GDataOperationRunner : public GDataAuthService::Observer {
|
| void RetryOperation(GDataOperationInterface* operation);
|
|
|
| private:
|
| - // GDataAuthService::Observer override.
|
| + // AuthService::Observer override.
|
| virtual void OnOAuth2RefreshTokenChanged() OVERRIDE;
|
|
|
| Profile* profile_; // not owned
|
|
|
| - scoped_ptr<GDataAuthService> auth_service_;
|
| - scoped_ptr<GDataOperationRegistry> operation_registry_;
|
| + scoped_ptr<AuthService> auth_service_;
|
| + scoped_ptr<OperationRegistry> operation_registry_;
|
|
|
| // Note: This should remain the last member so it'll be destroyed and
|
| // invalidate its weak pointers before any other members are destroyed.
|
| - base::WeakPtrFactory<GDataOperationRunner> weak_ptr_factory_;
|
| + base::WeakPtrFactory<OperationRunner> weak_ptr_factory_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(GDataOperationRunner);
|
| + DISALLOW_COPY_AND_ASSIGN(OperationRunner);
|
| };
|
|
|
| } // namespace gdata
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_OPERATION_RUNNER_H_
|
| +#endif // CHROME_BROWSER_CHROMEOS_GDATA_OPERATION_RUNNER_H_
|
|
|