Chromium Code Reviews| Index: chrome/browser/apps/drive/drive_app_converter.h |
| diff --git a/chrome/browser/ui/app_list/drive/drive_app_converter.h b/chrome/browser/apps/drive/drive_app_converter.h |
| similarity index 77% |
| rename from chrome/browser/ui/app_list/drive/drive_app_converter.h |
| rename to chrome/browser/apps/drive/drive_app_converter.h |
| index d153c9f2f710c5241926ce56cfa586bf4fc45717..a4005cd0fbed8d49edb995fc1d96a5b2e9291994 100644 |
| --- a/chrome/browser/ui/app_list/drive/drive_app_converter.h |
| +++ b/chrome/browser/apps/drive/drive_app_converter.h |
| @@ -2,8 +2,8 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef CHROME_BROWSER_UI_APP_LIST_DRIVE_DRIVE_APP_CONVERTER_H_ |
| -#define CHROME_BROWSER_UI_APP_LIST_DRIVE_DRIVE_APP_CONVERTER_H_ |
| +#ifndef CHROME_BROWSER_APPS_DRIVE_DRIVE_APP_CONVERTER_H_ |
| +#define CHROME_BROWSER_APPS_DRIVE_DRIVE_APP_CONVERTER_H_ |
| #include <string> |
| @@ -15,16 +15,16 @@ |
| #include "chrome/browser/extensions/install_observer.h" |
| #include "chrome/common/web_application_info.h" |
| +class Profile; |
| + |
| namespace extensions { |
|
benwells
2014/06/05 01:24:39
This and the other files in c/b/apps shouldn't be
xiyuan
2014/06/05 17:48:32
Done.
|
| + |
| class CrxInstaller; |
| class Extension; |
| -} |
| - |
| -class Profile; |
| // DriveAppConverter creates and installs a local URL app for the given |
| // DriveAppInfo into the given profile. |
| -class DriveAppConverter : public extensions::InstallObserver { |
| +class DriveAppConverter : public InstallObserver { |
| public: |
| typedef base::Callback<void(const DriveAppConverter*, bool success)> |
| FinishedCallback; |
| @@ -35,9 +35,10 @@ class DriveAppConverter : public extensions::InstallObserver { |
| virtual ~DriveAppConverter(); |
| void Start(); |
| + bool IsStarted() const; |
| const drive::DriveAppInfo& app_info() const { return app_info_; } |
| - const extensions::Extension* app() const { return app_; } |
| + const Extension* app() const { return app_; } |
| private: |
| class IconFetcher; |
| @@ -48,7 +49,7 @@ class DriveAppConverter : public extensions::InstallObserver { |
| void StartInstall(); |
| void PostInstallCleanUp(); |
| - // extensions::InstallObserver: |
| + // InstallObserver: |
| virtual void OnFinishCrxInstall(const std::string& extension_id, |
| bool success) OVERRIDE; |
| @@ -56,14 +57,16 @@ class DriveAppConverter : public extensions::InstallObserver { |
| const drive::DriveAppInfo app_info_; |
| WebApplicationInfo web_app_; |
| - const extensions::Extension* app_; |
| + const Extension* app_; |
| ScopedVector<IconFetcher> fetchers_; |
| - scoped_refptr<extensions::CrxInstaller> crx_installer_; |
| + scoped_refptr<CrxInstaller> crx_installer_; |
| FinishedCallback finished_callback_; |
| DISALLOW_COPY_AND_ASSIGN(DriveAppConverter); |
| }; |
| -#endif // CHROME_BROWSER_UI_APP_LIST_DRIVE_DRIVE_APP_CONVERTER_H_ |
| +} // namespace extensions |
| + |
| +#endif // CHROME_BROWSER_APPS_DRIVE_DRIVE_APP_CONVERTER_H_ |